From cb3e282cdacdd1e42c4e62712263f515a5ffd128 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Thu, 2 Jul 2015 18:59:10 -0700 Subject: [PATCH] unique host deps, otherwise we get 600000 char derivations --- pkgs/stdenv/generic/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 07486093da8..fe7bec54ba0 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -147,8 +147,9 @@ let __impureHostDeps = attrs.__impureHostDeps or []; __propagatedImpureHostDeps = attrs.__propagatedImpureHostDeps or []; - computedImpureHostDeps = lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs); - computedPropagatedImpureHostDeps = lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs); + # TODO: remove lib.unique once nix has a list canonicalization primitive + computedImpureHostDeps = lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs)); + computedPropagatedImpureHostDeps = lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs)); in { builder = attrs.realBuilder or shell;