diff options
| author | Peter Simons <simons@cryp.to> | 2015-07-23 22:16:16 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-08-05 21:36:20 +0200 |
| commit | ab77228749626b00b726d7050f3e02ef1865218e (patch) | |
| tree | 10fb36a115990cff67e3c57bb3975aee9bb8590a /pkgs/development | |
| parent | e4d493fc5449d85c66d45bbfb0531eea3241baa1 (diff) | |
| download | nixlib-ab77228749626b00b726d7050f3e02ef1865218e.tar nixlib-ab77228749626b00b726d7050f3e02ef1865218e.tar.gz nixlib-ab77228749626b00b726d7050f3e02ef1865218e.tar.bz2 nixlib-ab77228749626b00b726d7050f3e02ef1865218e.tar.lz nixlib-ab77228749626b00b726d7050f3e02ef1865218e.tar.xz nixlib-ab77228749626b00b726d7050f3e02ef1865218e.tar.zst nixlib-ab77228749626b00b726d7050f3e02ef1865218e.zip | |
haskell-generic-builder: improve recognition of pkgconfig dependencies
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2af3d9646193..26643f075b05 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -45,7 +45,6 @@ , useCpphs ? false } @ args: -assert pkgconfigDepends != [] -> pkgconfig != null; assert editedCabalFile != null -> revision != null; let @@ -105,10 +104,13 @@ let isHaskellPkg = x: (x ? pname) && (x ? version) && (x ? env); isSystemPkg = x: !isHaskellPkg x; + allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ + optionals doCheck testPkgconfigDepends; + propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends ++ - optionals (pkgconfigDepends != []) ([pkgconfig] ++ pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends) ++ + optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++ optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends); allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; @@ -122,6 +124,9 @@ let ghcCommandCaps = toUpper ghcCommand; in + +assert allPkgconfigDepends != [] -> pkgconfig != null; + stdenv.mkDerivation ({ name = "${optionalString (hasActiveLibrary && pname != "ghcjs") "haskell-"}${pname}-${version}"; |