From f59c15906229d8458844003cedbb4aac78926def Mon Sep 17 00:00:00 2001 From: Nathan Perry Date: Sat, 23 Jan 2021 06:26:47 -0500 Subject: buildInputs -> nativeBuildInputs --- flake.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index 754f59f..d3c8841 100644 --- a/flake.nix +++ b/flake.nix @@ -23,10 +23,6 @@ ... } @ inputs: (flake-utils.lib.eachDefaultSystem (system: let - barepkgs = import nixpkgs { - inherit system; - }; - pkgs = import nixpkgs { inherit system; @@ -61,13 +57,15 @@ postgresql ]; + inherit (pkgs) lib; + pkg = naersk.buildPackage { pname = "thulani"; version = self.rev or "dirty"; - src = pkgs.lib.cleanSource ./.; + src = lib.cleanSource ./.; - buildInputs = deps; + nativeBuildInputs = deps; remapPathPrefix = true; }; @@ -77,10 +75,7 @@ cargo rustc - barepkgs.rustracer - # (rustracer.overrideAttrs (old: { - # dontCheck = true; - # })) + rustracer ]) ++ deps; RUST_SRC_PATH = "${pkgs.naerskRust}/lib/rustlib/src/rust"; -- cgit v1.3.1