diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-19 10:52:10 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-19 10:57:48 -0400 |
| commit | 37eca93aab86a132d5c29f2d4cbe37f6493f03b7 (patch) | |
| tree | e2544759d83c5ceedda917687ea043694f478df3 /pkgs/development/haskell-modules/generic-builder.nix | |
| parent | d21653f465f5a9d9123ac4126fd0560cf74ab0cd (diff) | |
| download | nixlib-37eca93aab86a132d5c29f2d4cbe37f6493f03b7.tar nixlib-37eca93aab86a132d5c29f2d4cbe37f6493f03b7.tar.gz nixlib-37eca93aab86a132d5c29f2d4cbe37f6493f03b7.tar.bz2 nixlib-37eca93aab86a132d5c29f2d4cbe37f6493f03b7.tar.lz nixlib-37eca93aab86a132d5c29f2d4cbe37f6493f03b7.tar.xz nixlib-37eca93aab86a132d5c29f2d4cbe37f6493f03b7.tar.zst nixlib-37eca93aab86a132d5c29f2d4cbe37f6493f03b7.zip | |
haskell generic-builder: Only pass --extra-* for host deps
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 52df573d222e..52128d3fc5d1 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -211,18 +211,6 @@ let cp -f "$p/lib/${ghcName}/package.conf.d/"*.conf ${packageConfDir}/ continue fi - if [ -d "$p/include" ]; then - configureFlags+=" --extra-include-dirs=$p/include" - fi - if [ -d "$p/lib" ]; then - configureFlags+=" --extra-lib-dirs=$p/lib" - fi - '' - # It is not clear why --extra-framework-dirs does work fine on Linux - + optionalString (!buildPlatform.isDarwin || versionAtLeast nativeGhc.version "8.0") '' - if [[ -d "$p/Library/Frameworks" ]]; then - configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks" - fi ''; in @@ -287,6 +275,19 @@ stdenv.mkDerivation ({ + '' for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do ${buildPkgDb ghc.name "$packageConfDir"} + if [ -d "$p/include" ]; then + configureFlags+=" --extra-include-dirs=$p/include" + fi + if [ -d "$p/lib" ]; then + configureFlags+=" --extra-lib-dirs=$p/lib" + fi + '' + # It is not clear why --extra-framework-dirs does work fine on Linux + + optionalString (!buildPlatform.isDarwin || versionAtLeast nativeGhc.version "8.0") '' + if [[ -d "$p/Library/Frameworks" ]]; then + configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks" + fi + '' + '' done '' # only use the links hack if we're actually building dylibs. otherwise, the |