public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell-generic-builder: add support for build-tools in the test suite stanza

Browse Source
This commit is contained in:
Peter Simons 2015-08-06 15:30:46 +02:00
parent fcb8d47fcd
commit 7064e4fb46
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -111,7 +111,7 @@ let
otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
buildTools ++ libraryToolDepends ++ executableToolDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends ++
optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++ optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++
optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends); optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends);
allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs; haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs;