diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-02-02 11:44:11 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-21 23:27:38 -0500 |
| commit | 54ead73271bec25986836c91b1acb0afa7cdbbab (patch) | |
| tree | ab8825417ffda03021bdc0a6025dc6edd04ae106 /pkgs/development/haskell-modules | |
| parent | 0eb3acaf386b15097c8b248c5a50bc7650ef8be9 (diff) | |
| download | nixlib-54ead73271bec25986836c91b1acb0afa7cdbbab.tar nixlib-54ead73271bec25986836c91b1acb0afa7cdbbab.tar.gz nixlib-54ead73271bec25986836c91b1acb0afa7cdbbab.tar.bz2 nixlib-54ead73271bec25986836c91b1acb0afa7cdbbab.tar.lz nixlib-54ead73271bec25986836c91b1acb0afa7cdbbab.tar.xz nixlib-54ead73271bec25986836c91b1acb0afa7cdbbab.tar.zst nixlib-54ead73271bec25986836c91b1acb0afa7cdbbab.zip | |
generic-builder: Make GHC a proper dependency
Rather than just sticking it on the PATH
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 5b2b23fc7903..ad9eec61668f 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -160,8 +160,8 @@ let allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends; - nativeBuildInputs = optional (allPkgconfigDepends != []) pkgconfig ++ - buildTools ++ libraryToolDepends ++ executableToolDepends ++ [ removeReferencesTo ]; + nativeBuildInputs = [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++ + buildTools ++ libraryToolDepends ++ executableToolDepends; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ optionals (allPkgconfigDepends != []) allPkgconfigDepends ++ @@ -220,7 +220,6 @@ stdenv.mkDerivation ({ runHook preSetupCompilerEnvironment echo "Build with ${ghc}." - export PATH="${ghc}/bin:$PATH" ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} packageConfDir="$TMPDIR/package.conf.d" @@ -276,6 +275,8 @@ stdenv.mkDerivation ({ runHook postCompileBuildDriver ''; + # Cabal takes flags like `--configure-option=--host=...` instead + configurePlatforms = []; inherit configureFlags; configurePhase = '' |