Merge branch 'staging'

This commit is contained in:
Vladimír Čunát 2016-11-19 21:55:26 +01:00
commit 2aea31b52e
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA

View File

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