ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-29 00:27:49 +03:00
Code Issues Projects Releases Wiki Activity

haskell: Fix with-packages-wrapper MacOS linker hack for GHC 8.8

Browse Source 
`with-packages-wrapper.nix` has a hack to workaround the linker limit
in MacOS Sierra. However that is now broken with GHC 8.8, because of
slight change in the format of the package config.
In short, the package config produced by GHC 8.8 has a new line between
the key and list of values, while earlier versions have them separated
by a single space.

This PR fixes the linker hack by modifying the `grep` and `sed` commands
to pattern match on either space or new line, so that the hack can work
on all versions of GHC.
This commit is contained in:
Soares Chen 2020-05-28 22:10:36 +02:00 committed by Peter Simons
parent 53594c65ce
commit 32d2de8e00
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/haskell-modules/with-packages-wrapper.nix
View File

@ -113,7 +113,7 @@ symlinkJoin {
# Clean up the old links that may have been (transitively) included by # Clean up the old links that may have been (transitively) included by
# symlinkJoin: # symlinkJoin:
rm -f $dynamicLinksDir/* rm -f $dynamicLinksDir/*
for d in $(grep dynamic-library-dirs $packageConfDir/*|awk '{print $2}'|sort -u); do for d in $(grep -Poz "dynamic-library-dirs:\s*\K .+\n" $packageConfDir/*|awk '{print $2}'|sort -u); do
ln -s $d/*.dylib $dynamicLinksDir ln -s $d/*.dylib $dynamicLinksDir
done done
for f in $packageConfDir/*.conf; do for f in $packageConfDir/*.conf; do
@ -123,7 +123,7 @@ symlinkJoin {
# $dynamicLinksDir # $dynamicLinksDir
cp $f $f-tmp cp $f $f-tmp
rm $f rm $f
sed "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," $f-tmp > $f sed "N;s,dynamic-library-dirs:\s*.*,dynamic-library-dirs: $dynamicLinksDir," $f-tmp > $f
rm $f-tmp rm $f-tmp
done done
'') + '' '') + ''