haskell generic-builder: Use strictDeps always

This helps avoid the `ARG_MAX` issues we've been having, and is
generally a good idea to ensure cross comparability anyways.
This commit is contained in:
John Ericson 2018-06-03 12:51:47 -04:00 committed by Matthew Bauer
parent 359e0ce4bb
commit ceaf285c0c
2 changed files with 1 additions and 6 deletions

View File

@ -1056,12 +1056,6 @@ self: super: {
# Work around overspecified constraint on github ==0.18.
github-backup = doJailbreak super.github-backup;
# Work around large number of repeated arguments
# https://github.com/NixOS/nixpkgs/issues/40013
taffybar = super.taffybar.overrideDerivation (drv: {
strictDeps = true;
});
# dhall-json requires a very particular dhall version
dhall-json_1_2_1 = super.dhall-json_1_2_1.override { dhall = self.dhall_1_15_0; };

View File

@ -233,6 +233,7 @@ stdenv.mkDerivation ({
inherit src;
strictDeps = true;
inherit depsBuildBuild nativeBuildInputs;
buildInputs = otherBuildInputs ++ optionals (!hasActiveLibrary) propagatedBuildInputs;
propagatedBuildInputs = optionals hasActiveLibrary propagatedBuildInputs;