diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-08-07 13:40:39 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-08-07 13:40:39 -0700 |
| commit | 4624985561321d04aede0163c326a2c3d4c38d30 (patch) | |
| tree | 391d62e16f20e4d9679de3a64792e329824b3171 /pkgs/development/haskell-modules/generic-builder.nix | |
| parent | 793cbaedf40d5ef63a688a0328bdfb85986b0eef (diff) | |
| parent | 590e11bc534b90ce8de3eb27753761f2d5af1612 (diff) | |
| download | nixlib-4624985561321d04aede0163c326a2c3d4c38d30.tar nixlib-4624985561321d04aede0163c326a2c3d4c38d30.tar.gz nixlib-4624985561321d04aede0163c326a2c3d4c38d30.tar.bz2 nixlib-4624985561321d04aede0163c326a2c3d4c38d30.tar.lz nixlib-4624985561321d04aede0163c326a2c3d4c38d30.tar.xz nixlib-4624985561321d04aede0163c326a2c3d4c38d30.tar.zst nixlib-4624985561321d04aede0163c326a2c3d4c38d30.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index b4d1461d1d21..6378f4c1e635 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -113,7 +113,7 @@ let otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends ++ optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++ - optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends); + optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends); allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs; |