Merge branch 'staging'

This commit is contained in:
Vladimír Čunát
2016-11-19 21:55:26 +01:00
@@ -207,9 +207,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