From fc99c337edd29d9596379667063bc3a8f3cea5b3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 20 Nov 2018 22:19:05 -0600 Subject: [PATCH] =?UTF-8?q?make-derivation:=20don=E2=80=99t=20disallow=20p?= =?UTF-8?q?ropagated=20native=20inputs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- pkgs/stdenv/generic/make-derivation.nix | 6 +++--- 1 file 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]