diff --git a/default.nix b/default.nix index c2deb40..bd64eb6 100644 --- a/default.nix +++ b/default.nix @@ -6,8 +6,9 @@ , src ? ./. }: let - filteredSrc = src; # flake only includeds filed tracked by git builtins.filterSource pkgs.lib.cleanSourceFilter src; - crate2nix_tools = import "${fetchGit { url = "https://github.com/kolloch/crate2nix.git"; rev = "9f3f42bfecebbc3be5526a4194c82fdfc53269e9"; }}/tools.nix" { inherit pkgs; }; + filteredSrc = src; # flake only includeds files tracked by git builtins.filterSource pkgs.lib.cleanSourceFilter src; + crate2nix = fetchGit { url = "https://github.com/kolloch/crate2nix.git"; rev = "2f861db71475b4cf0d266b8d2fd625cccf1e331b"; }; + crate2nix_tools = (if builtins.compareVersions pkgs.crate2nix.version "0.8.0" == 1 then import (pkgs.crate2nix.src + "/tools.nix") else import "${crate2nix}/tools.nix") { inherit pkgs; }; overrides = with pkgs; let clang = llvmPackages_10.clang; libclang = llvmPackages_10.libclang; @@ -19,7 +20,7 @@ let LIBCLANG_PATH = "${libclang}/lib"; }; brownpaper = attrs: { - buildInputs = [ gmp ]; + buildInputs = [ gmp (pkgs.callPackage "${crate2nix}/crate2nix/Cargo.nix" { strictDeprecation = true; }) ]; }; }; client = with pkgs; runCommandLocal "brownpaper" {