on iko/ghcjs-patch-master help sign in
builder: Remove self from depends of "all" component
commit0747270c9d910daa232a56a846d50b97ca02d6f9 authorRodney Lorrimar <rodney.lorrimar@iohk.io> dateMon 4 Feb 2019, 14:59 (8 years ago) parent33e8d11
1 file changed+7−3
builder/comp-builder.nix+7−3
builder/comp-builder.nix+7−3
@@ -37,11 +37,15 @@ let
3737 echo "${field}: ${lib.concatStringsSep " " xs}" >> $out/cabal.config
3838 '';
3939
40+ componentDepends = if haskellLib.isAll componentId
41+ then lib.filter (p: p.identifier.name != componentId.cname) component.depends
42+ else component.depends;
43+
4044 flatDepends =
4145 let
4246 makePairs = map (p: rec { key="${val}"; val=p.components.library; });
4347 closure = builtins.genericClosure {
44− startSet = makePairs component.depends;
48+ startSet = makePairs componentDepends;
4549 operator = {val,...}: makePairs val.config.depends;
4650 };
4751 in map ({val,...}: val) closure;
@@ -99,7 +103,7 @@ let
99103 clear-package-db
100104 package-db $out/package.conf.d
101105 EOF
102− ${lib.concatMapStringsSep "\n" (p: envDep "--package-db ${p.components.library}/package.conf.d" p.identifier.name) component.depends}
106+ ${lib.concatMapStringsSep "\n" (p: envDep "--package-db ${p.components.library}/package.conf.d" p.identifier.name) componentDepends}
103107 ${lib.concatMapStringsSep "\n" (envDep "") (lib.remove "ghc" nonReinstallablePkgs)}
104108
105109 '' + lib.optionalString component.doExactConfig ''
@@ -107,7 +111,7 @@ let
107111 echo "allow-newer: ${package.identifier.name}:*" >> $out/cabal.config
108112 echo "allow-older: ${package.identifier.name}:*" >> $out/cabal.config
109113
110− ${lib.concatMapStringsSep "\n" (p: exactDep "--package-db ${p.components.library}/package.conf.d" p.identifier.name) component.depends}
114+ ${lib.concatMapStringsSep "\n" (p: exactDep "--package-db ${p.components.library}/package.conf.d" p.identifier.name) componentDepends}
111115 ${lib.concatMapStringsSep "\n" (exactDep "") nonReinstallablePkgs}
112116
113117 ''