diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-20 22:19:05 -0600 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-21 09:39:47 -0600 |
| commit | fc99c337edd29d9596379667063bc3a8f3cea5b3 (patch) | |
| tree | 8cdd9eba08f51b1a12810f14cd77a61148cdbdcd /pkgs/stdenv | |
| parent | 3d6f6e3e7f3e246a4cd2ce94bb88b5aad908b91d (diff) | |
| download | nixpkgs-fc99c337edd29d9596379667063bc3a8f3cea5b3.tar nixpkgs-fc99c337edd29d9596379667063bc3a8f3cea5b3.tar.gz nixpkgs-fc99c337edd29d9596379667063bc3a8f3cea5b3.tar.bz2 nixpkgs-fc99c337edd29d9596379667063bc3a8f3cea5b3.tar.lz nixpkgs-fc99c337edd29d9596379667063bc3a8f3cea5b3.tar.xz nixpkgs-fc99c337edd29d9596379667063bc3a8f3cea5b3.tar.zst nixpkgs-fc99c337edd29d9596379667063bc3a8f3cea5b3.zip | |
make-derivation: don’t disallow propagated native inputs
propagateNativeBuildInputs will end up going in the output derivation. This case is allowed to end up in references because of that. Sorry for the disruption! Fixes #50865
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index a0912366312..60d6f1bd92c 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -238,12 +238,12 @@ rec { # propagated dependencies here as well. disallowedReferences = (attrs.disallowedReferences or []) ++ (lib.subtractLists - (lib.concatLists ( (lib.elemAt propagatedDependencies 1) ++ + (lib.concatLists ((lib.elemAt propagatedDependencies 0) ++ + (lib.elemAt propagatedDependencies 1) ++ (lib.elemAt dependencies 1) ++ (lib.elemAt propagatedDependencies 2) ++ (lib.elemAt dependencies 2) ) ) - (lib.concatLists ( (lib.elemAt propagatedDependencies 0) ++ - (lib.elemAt dependencies 0) ) ) ); + (lib.concatLists ((lib.elemAt dependencies 0)) ) ); } // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { cmakeFlags = (/**/ if lib.isString cmakeFlags then [cmakeFlags] |