Revert "make-derivation: add disallowedReferences in strictDeps"
This reverts commit8dbfb61e46. Also reverts commitfc99c337ed. Fixes #50915
This commit is contained in:
@@ -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]
|
||||||
|
|||||||
Reference in New Issue
Block a user