diff options
| author | Christian Gram Kalhauge <christian@kalhauge.dk> | 2016-07-21 11:39:52 +0200 |
|---|---|---|
| committer | Christian Gram Kalhauge <christian@kalhauge.dk> | 2016-07-21 11:39:52 +0200 |
| commit | de5a2ee03476180fef621a35d1efbdfdd4b1bb86 (patch) | |
| tree | 85934dab6817aca48f23e9f9207c14b2dc0ea225 /pkgs | |
| parent | ab46f698027c9c14f95ec73db4541bacdb7ce3dc (diff) | |
| download | nixlib-de5a2ee03476180fef621a35d1efbdfdd4b1bb86.tar nixlib-de5a2ee03476180fef621a35d1efbdfdd4b1bb86.tar.gz nixlib-de5a2ee03476180fef621a35d1efbdfdd4b1bb86.tar.bz2 nixlib-de5a2ee03476180fef621a35d1efbdfdd4b1bb86.tar.lz nixlib-de5a2ee03476180fef621a35d1efbdfdd4b1bb86.tar.xz nixlib-de5a2ee03476180fef621a35d1efbdfdd4b1bb86.tar.zst nixlib-de5a2ee03476180fef621a35d1efbdfdd4b1bb86.zip | |
Reduce computation time for non-darwin users
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2bcf6ee854f6..faca3f2dff17 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -192,10 +192,12 @@ stdenv.mkDerivation ({ configureFlags+=" --extra-include-dirs=$p/include" fi if [ -d "$p/lib" ]; then - configureFlags+=" --extra-lib-dirs=$p/lib" - if [[ ${ if stdenv.isDarwin then "yes" else "no"} = "yes" ]]; then - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$p/lib; - fi + configureFlags+=" --extra-lib-dirs=$p/lib"${ + if stdenv.isDarwin then + "; export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$p/lib;" + else + "" + } fi done ${ghcCommand}-pkg --${packageDbFlag}="$packageConfDir" recache |