diff options
| -rw-r--r-- | nix/writers/default.nix | 14 | ||||
| -rw-r--r-- | users/Profpatsch/netencode/default.nix | 2 |
2 files changed, 5 insertions, 11 deletions
diff --git a/nix/writers/default.nix b/nix/writers/default.nix index f43761865fc2..b0795ab2c886 100644 --- a/nix/writers/default.nix +++ b/nix/writers/default.nix @@ -9,9 +9,7 @@ let bins.s6-ln "-s" path "$out" ]; - # Build a rust executable. - # Takes all arguments that `pkgs.buildRustCrate` accepts. - # Rather leaky abstraction. + # Build a rust executable, $out is the executable. rustSimple = args@{name, ...}: src: linkTo name "${rustSimpleBin args src}/bin/${name}"; @@ -20,8 +18,7 @@ let name, dependencies ? [], doCheck ? true, - ... - }@args: src: + }: src: (if doCheck then testRustSimple else pkgs.lib.id) (pkgs.buildRustCrate ({ pname = name; @@ -37,7 +34,7 @@ let cp "$srcPath" $out/src/bin/${name}.rs find $out ''; - } // args)); + })); # Build a rust library, that can be used as dependency to `rustSimple`. # Wrapper around `pkgs.buildRustCrate`, takes all its arguments. @@ -45,8 +42,7 @@ let name, dependencies ? [], doCheck ? true, - ... - }@args: src: + }: src: (if doCheck then testRustSimple else pkgs.lib.id) (pkgs.buildRustCrate ({ pname = name; @@ -61,7 +57,7 @@ let cp "$srcPath" $out/src/lib.rs find $out ''; - } // args)); + })); /* Takes a `buildRustCrate` derivation as an input, * builds it with `{ buildTests = true; }` and runs diff --git a/users/Profpatsch/netencode/default.nix b/users/Profpatsch/netencode/default.nix index 6662e622e1bf..db892cc9de8d 100644 --- a/users/Profpatsch/netencode/default.nix +++ b/users/Profpatsch/netencode/default.nix @@ -7,8 +7,6 @@ let depot.third_party.rust-crates.nom depot.users.Profpatsch.execline.exec-helpers ]; - release = false; - verbose = true; } (builtins.readFile ./netencode.rs); gen = import ./gen.nix { inherit lib; }; |