diff options
author | Peter Simons <simons@cryp.to> | 2017-07-18 20:54:10 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2017-07-26 10:17:48 +0200 |
commit | e69c7f56419589c0d3296e81f47032fa813cca4b (patch) | |
tree | 712f916b353e1f94b86201d8040495aa3c562c62 | |
parent | b285b85754b73c00ef55e93488576756ec62dd44 (diff) | |
download | nixlib-e69c7f56419589c0d3296e81f47032fa813cca4b.tar nixlib-e69c7f56419589c0d3296e81f47032fa813cca4b.tar.gz nixlib-e69c7f56419589c0d3296e81f47032fa813cca4b.tar.bz2 nixlib-e69c7f56419589c0d3296e81f47032fa813cca4b.tar.lz nixlib-e69c7f56419589c0d3296e81f47032fa813cca4b.tar.xz nixlib-e69c7f56419589c0d3296e81f47032fa813cca4b.tar.zst nixlib-e69c7f56419589c0d3296e81f47032fa813cca4b.zip |
haskell-generic-builder: include setupHaskellDepends in the generated "env" attribute
We achieve this by moving setupHaskellDepends from the buildInputs attribute into "otherBuildInputs", which is the attribute the builder uses to construct the build inputs in both the actual build as well as the "env" attribute.
-rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 97a3adaf220f..c972a2b36b70 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -144,9 +144,9 @@ let allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ optionals doCheck testPkgconfigDepends ++ optionals withBenchmarkDepends benchmarkPkgconfigDepends; - nativeBuildInputs = setupHaskellDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends; + nativeBuildInputs = buildTools ++ libraryToolDepends ++ executableToolDepends; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; - otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ + otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++ optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ # ghcjs's hsc2hs calls out to the native hsc2hs |