JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Merge pull request #17145 from kalhauge/haskell_darwin_dyld"

Browse Source 
This fix doesn't actually fix the cabal bug (see #16357), but it does
cause other bugs (see #20476)

Fixes #20476

This reverts commit b89fa5fd5c, reversing
changes made to e4b146b041.
This commit is contained in:
Shea Levy 2016-11-17 07:25:42 -05:00
parent 380bb207b6
commit 3995655d2c
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -194,9 +194,6 @@ stdenv.mkDerivation ({
fi fi
if [ -d "$p/lib" ]; then if [ -d "$p/lib" ]; then
configureFlags+=" --extra-lib-dirs=$p/lib" configureFlags+=" --extra-lib-dirs=$p/lib"
${ stdenv.lib.optionalString stdenv.isDarwin
"export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$p/lib"
}
fi fi
done done
${ghcCommand}-pkg --${packageDbFlag}="$packageConfDir" recache ${ghcCommand}-pkg --${packageDbFlag}="$packageConfDir" recache