diff options
author | John Ericson <Ericson2314@Yahoo.com> | 2017-09-20 15:48:29 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-21 15:49:55 -0400 |
commit | 139b4cd0e3f9ea4c7e1ea56e97faa18f537697b3 (patch) | |
tree | 5a24f9bf8bd21f98171cb5cf827b44c465eefb96 /pkgs/development/haskell-modules | |
parent | 6810ae793562ba59c100e67a5d12521ce12557ea (diff) | |
download | nixlib-139b4cd0e3f9ea4c7e1ea56e97faa18f537697b3.tar nixlib-139b4cd0e3f9ea4c7e1ea56e97faa18f537697b3.tar.gz nixlib-139b4cd0e3f9ea4c7e1ea56e97faa18f537697b3.tar.bz2 nixlib-139b4cd0e3f9ea4c7e1ea56e97faa18f537697b3.tar.lz nixlib-139b4cd0e3f9ea4c7e1ea56e97faa18f537697b3.tar.xz nixlib-139b4cd0e3f9ea4c7e1ea56e97faa18f537697b3.tar.zst nixlib-139b4cd0e3f9ea4c7e1ea56e97faa18f537697b3.zip |
haskell generic-builder: Fix pkg-config dependency
It should be a nativeBuidInput
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 06903d833588..5d8a28f5c2b0 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -152,10 +152,11 @@ let allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends; - nativeBuildInputs = buildTools ++ libraryToolDepends ++ executableToolDepends ++ [ removeReferencesTo ]; + nativeBuildInputs = optional (allPkgconfigDepends != []) pkgconfig ++ + buildTools ++ libraryToolDepends ++ executableToolDepends ++ [ removeReferencesTo ]; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ - optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++ + optionals (allPkgconfigDepends != []) allPkgconfigDepends ++ optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ # ghcjs's hsc2hs calls out to the native hsc2hs optional isGhcjs nativeGhc ++ |