diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-22 09:57:08 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-22 09:57:08 +0100 |
| commit | c31cb577aed1e94e467ea1d6455fc275946d3b2d (patch) | |
| tree | fcabcf126d5e422fa998925403add39444c2a166 /pkgs/stdenv/generic | |
| parent | 16267b4389c75cba9f0f10664043bd6d47013827 (diff) | |
| parent | 9467621b186dcaf8a24772482e0d8a6a581ce0bb (diff) | |
| download | nixpkgs-c31cb577aed1e94e467ea1d6455fc275946d3b2d.tar nixpkgs-c31cb577aed1e94e467ea1d6455fc275946d3b2d.tar.gz nixpkgs-c31cb577aed1e94e467ea1d6455fc275946d3b2d.tar.bz2 nixpkgs-c31cb577aed1e94e467ea1d6455fc275946d3b2d.tar.lz nixpkgs-c31cb577aed1e94e467ea1d6455fc275946d3b2d.tar.xz nixpkgs-c31cb577aed1e94e467ea1d6455fc275946d3b2d.tar.zst nixpkgs-c31cb577aed1e94e467ea1d6455fc275946d3b2d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/stdenv/generic')
| -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 a2ff42151a0..57e757080a2 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -249,12 +249,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] |