diff options
author | maralorn <mail@maralorn.de> | 2023-06-28 19:07:41 +0200 |
---|---|---|
committer | maralorn <mail@maralorn.de> | 2023-06-28 19:07:41 +0200 |
commit | 26b42078cf309174a19db2a648e6288240ffa674 (patch) | |
tree | 846163b4aa6bbfca03605875cd08b164dabc6ec2 /pkgs/development/haskell-modules | |
parent | 0aaf2b2ebc2abcdcea54bc2a3ba6c383ccea7b22 (diff) | |
parent | 93f1e999f22704978505a55ca2168caae8fb6724 (diff) | |
download | nixlib-26b42078cf309174a19db2a648e6288240ffa674.tar nixlib-26b42078cf309174a19db2a648e6288240ffa674.tar.gz nixlib-26b42078cf309174a19db2a648e6288240ffa674.tar.bz2 nixlib-26b42078cf309174a19db2a648e6288240ffa674.tar.lz nixlib-26b42078cf309174a19db2a648e6288240ffa674.tar.xz nixlib-26b42078cf309174a19db2a648e6288240ffa674.tar.zst nixlib-26b42078cf309174a19db2a648e6288240ffa674.zip |
Merge branch 'master' into haskell-updates
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r-- | pkgs/development/haskell-modules/with-packages-wrapper.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 34eb2b71d759..03f59302a0d3 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -55,6 +55,12 @@ let libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}" + lib.optionalString (ghc ? hadrian) "/lib"; + # Boot libraries for GHC are present in a separate directory. + bootLibDir = let arch = if stdenv.targetPlatform.isAarch64 + then "aarch64" + else "x86_64"; + platform = if stdenv.targetPlatform.isDarwin then "osx" else "linux"; + in "${ghc}/lib/${ghc.haskellCompilerName}/lib/${arch}-${platform}-${ghc.haskellCompilerName}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; paths = lib.concatLists ( @@ -131,11 +137,17 @@ symlinkJoin { '' + (lib.optionalString (stdenv.targetPlatform.isDarwin && !isGhcjs && !stdenv.targetPlatform.isiOS) '' # Work around a linker limit in macOS Sierra (see generic-builder.nix): local packageConfDir="${packageCfgDir}"; - local dynamicLinksDir="$out/lib/links" + local dynamicLinksDir="$out/lib/links"; mkdir -p $dynamicLinksDir # Clean up the old links that may have been (transitively) included by # symlinkJoin: rm -f $dynamicLinksDir/* + + # Boot libraries are located differently than other libraries since GHC 9.6, so handle them separately. + if [[ -x "${bootLibDir}" ]]; then + ln -s "${bootLibDir}"/*.dylib $dynamicLinksDir + fi + for d in $(grep -Poz "dynamic-library-dirs:\s*\K .+\n" $packageConfDir/*|awk '{print $2}'|sort -u); do ln -s $d/*.dylib $dynamicLinksDir done @@ -146,7 +158,7 @@ symlinkJoin { # $dynamicLinksDir cp $f $f-tmp rm $f - sed "N;s,dynamic-library-dirs:\s*.*,dynamic-library-dirs: $dynamicLinksDir," $f-tmp > $f + sed "N;s,dynamic-library-dirs:\s*.*\n,dynamic-library-dirs: $dynamicLinksDir\n," $f-tmp > $f rm $f-tmp done '') + '' |