public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildRustPackage: handle cargoBuildFlags in cargoBuildHook

Browse Source
This commit is contained in:
Daniël de Kok 2021-02-15 12:08:06 +01:00
parent 05e40e79a8
commit 087ab3db9c
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/build-support/rust/default.nix
View File

@ -36,7 +36,6 @@
, nativeBuildInputs ? [] , nativeBuildInputs ? []
, cargoUpdateHook ? "" , cargoUpdateHook ? ""
, cargoDepsHook ? "" , cargoDepsHook ? ""
, cargoBuildFlags ? []
, buildType ? "release" , buildType ? "release"
, meta ? {} , meta ? {}
, cargoVendorDir ? null , cargoVendorDir ? null
@ -98,8 +97,6 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // lib.optionalAttrs u
} // { } // {
inherit buildAndTestSubdir cargoDeps; inherit buildAndTestSubdir cargoDeps;
cargoBuildFlags = lib.concatStringsSep " " cargoBuildFlags;
cargoBuildType = buildType; cargoBuildType = buildType;
patchRegistryDeps = ./patch-registry-deps; patchRegistryDeps = ./patch-registry-deps;

2
pkgs/build-support/rust/hooks/cargo-build-hook.sh
View File

@ -1,3 +1,5 @@
declare -a cargoBuildFlags
cargoBuildHook() { cargoBuildHook() {
echo "Executing cargoBuildHook" echo "Executing cargoBuildHook"