Skip to content

Commit

Permalink
Fix mismatched cargoDeps in nix and update mkDerivation to use finalA…
Browse files Browse the repository at this point in the history
…ttrs over rec
  • Loading branch information
nakoo committed Aug 14, 2024
1 parent bd1cc92 commit f38deb3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ let
testArgs = if debug then "" else "--release";
in
with pkgs;
llvmPackages_18.stdenv.mkDerivation rec {
llvmPackages_18.stdenv.mkDerivation (finalAttrs: {
name = "kime";
src = ./.;
buildInputs = deps.kimeBuildInputs;
nativeBuildInputs = deps.kimeNativeBuildInputs ++ [ rustPlatform.cargoSetupHook ];
version = kimeVersion;
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
inherit (finalAttrs) src;
#sha256 = "0000000000000000000000000000000000000000000000000000";
sha256 = "sha256-hlTxyaE/300CBGIJtFzIh6CT5PcmmqWt8CN428sr2U8=";
sha256 = "sha256-2MG6xigiKdvQX8PR457d6AXswTRPRJBPERvZqemjv24=";
};
LIBCLANG_PATH = "${pkgs.llvmPackages_18.libclang.lib}/lib";
dontUseCmakeConfigure = true;
Expand All @@ -37,5 +37,5 @@ llvmPackages_18.stdenv.mkDerivation rec {
checkPhase = ''
cargo test ${testArgs}
'';
}
})

0 comments on commit f38deb3

Please sign in to comment.