diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2018-07-10 15:32:23 +0200 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2018-07-11 16:56:53 +0200 |
| commit | 981458aaada0918f80c6871e21be1ea7a30957f1 (patch) | |
| tree | 858794eceb88a7d546b57bd228e0a6aeda4848c2 | |
| parent | haskell generic builder: avoid redundant lib output on darwin (diff) | |
| download | nixpkgs-origin/haskell-outputs-bin-etc-lib.tar.gz | |
haskell generic builder: use setup dependency libsorigin/haskell-outputs-bin-etc-lib
| -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 0e0d78ed3857..4d680474a4c0 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -207,13 +207,14 @@ let allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends; - depsBuildBuild = [ nativeGhc ]; + depsBuildBuild = [ nativeGhc ] ++ + map (stdenv.lib.getOutput "out") setupHaskellDepends; nativeBuildInputs = map stdenv.lib.getBin ( [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++ setupHaskellDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends ++ optionals doCheck testToolDepends ++ - optionals doBenchmark benchmarkToolDepends; + optionals doBenchmark benchmarkToolDepends ); propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends; otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ executableFrameworkDepends ++ |