Reduce computation time for non-darwin users

2016-07-21 11:39:52 +02:00
parent ab46f69802
commit de5a2ee034
1 changed files with 6 additions and 4 deletions
--- 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