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

Fix use of isDarwin conditionals.

Browse Source
This commit is contained in:
Judah Jacobson 2017-05-05 09:53:08 -07:00
parent 7131e06214
commit 2caa7b88ae
2 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,8 +228,7 @@ stdenv.mkDerivation ({
configureFlags+=" --extra-lib-dirs=$p/lib" configureFlags+=" --extra-lib-dirs=$p/lib"
fi fi
done done
'' + (optionalString stdenv.isDarwin ''
if "${if stdenv.isDarwin then "true" else "false"}"; then
# Work around a limit in the Mac OS X Sierra linker on the number of paths # Work around a limit in the Mac OS X Sierra linker on the number of paths
# referenced by any one dynamic library: # referenced by any one dynamic library:
# #
@ -245,8 +244,7 @@ stdenv.mkDerivation ({
for f in $packageConfDir/*.conf; do for f in $packageConfDir/*.conf; do
sed -i "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," $f sed -i "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," $f
done done
fi '') + ''
${ghcCommand}-pkg --${packageDbFlag}="$packageConfDir" recache ${ghcCommand}-pkg --${packageDbFlag}="$packageConfDir" recache
runHook postSetupCompilerEnvironment runHook postSetupCompilerEnvironment

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

@ -96,9 +96,8 @@ symlinkJoin {
makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}" makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}"
fi fi
done done
'' + (lib.optionalString stdenv.isDarwin ''
# Work around a linker limit in Mac OS X Sierra (see generic-builder.nix): # Work around a linker limit in Mac OS X Sierra (see generic-builder.nix):
if "${if stdenv.isDarwin then "true" else "false"}"; then
local packageConfDir="$out/lib/${ghc.name}/package.conf.d"; local packageConfDir="$out/lib/${ghc.name}/package.conf.d";
local dynamicLinksDir="$out/lib/links" local dynamicLinksDir="$out/lib/links"
mkdir -p $dynamicLinksDir mkdir -p $dynamicLinksDir
@ -118,8 +117,7 @@ symlinkJoin {
sed "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," $f-tmp > $f sed "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," $f-tmp > $f
rm $f-tmp rm $f-tmp
done done
fi '') + ''
${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"} ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"}
${# ghcjs will read the ghc_libdir file when resolving plugins. ${# ghcjs will read the ghc_libdir file when resolving plugins.
lib.optionalString (isGhcjs && ghcLibdir != null) '' lib.optionalString (isGhcjs && ghcLibdir != null) ''