From de5a2ee03476180fef621a35d1efbdfdd4b1bb86 Mon Sep 17 00:00:00 2001 From: Christian Gram Kalhauge Date: Thu, 21 Jul 2016 11:39:52 +0200 Subject: [PATCH] Reduce computation time for non-darwin users --- pkgs/development/haskell-modules/generic-builder.nix | 10 ++++++---- 1 file 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