diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-11-26 10:28:00 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-11-26 10:28:00 +0100 |
| commit | a5de78b7d7a794b744594bda47f3d11ce985d48d (patch) | |
| tree | 76d6d2190d5e860edd0c3ca03e1a3b09b48d9337 /pkgs/stdenv | |
| parent | e41154d1abcbcd1b9a0f542e590c63a210ea4266 (diff) | |
| parent | 4fef4fbb4bccc73d26b9a601d211990261cbb657 (diff) | |
| download | nixlib-a5de78b7d7a794b744594bda47f3d11ce985d48d.tar nixlib-a5de78b7d7a794b744594bda47f3d11ce985d48d.tar.gz nixlib-a5de78b7d7a794b744594bda47f3d11ce985d48d.tar.bz2 nixlib-a5de78b7d7a794b744594bda47f3d11ce985d48d.tar.lz nixlib-a5de78b7d7a794b744594bda47f3d11ce985d48d.tar.xz nixlib-a5de78b7d7a794b744594bda47f3d11ce985d48d.tar.zst nixlib-a5de78b7d7a794b744594bda47f3d11ce985d48d.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 57e757080a2d..1829531e8959 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -239,22 +239,6 @@ rec { inherit doCheck doInstallCheck; inherit outputs; - } // lib.optionalAttrs strictDeps { - # Make sure "build" dependencies don’t leak into outputs. We - # want to disallow references to depsBuildBuild, - # nativeBuildInputs, and depsBuildTarget. But depsHostHost, - # buildInputs, and depsTargetTarget is okay, so we subtract - # those from disallowedReferences in case a dependency is - # listed in multiple dependency lists. We also include - # propagated dependencies here as well. - disallowedReferences = (attrs.disallowedReferences or []) - ++ (lib.subtractLists - (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 dependencies 0)) ) ); } // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { cmakeFlags = (/**/ if lib.isString cmakeFlags then [cmakeFlags] |