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

Revert "make-derivation: add disallowedReferences in strictDeps"

Browse Source 
This reverts commit 8dbfb61e4617050917ce6bb7c5f4efc902c2a36c.
Also reverts commit fc99c337edd29d9596379667063bc3a8f3cea5b3.

Fixes #50915
This commit is contained in:
Matthew Bauer 2018-11-25 15:51:37 -06:00
parent b49ed49c68
commit 7eeb02d47b
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/stdenv/generic/make-derivation.nix
View File

@ -228,22 +228,6 @@ rec {
inherit doCheck doInstallCheck; inherit doCheck doInstallCheck;
inherit outputs; 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) { } // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
cmakeFlags = cmakeFlags =
(/**/ if lib.isString cmakeFlags then [cmakeFlags] (/**/ if lib.isString cmakeFlags then [cmakeFlags]