Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e0e29a5996ec
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ac40691ad3f8
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 18, 2019

  1. ghc{822,863}Binary: fix to work w/musl again, __strdup -> strdup 

    (cherry picked from commit 9a10434)
    @dtzWill
    dtzWill committed Mar 18, 2019
    Copy the full SHA
    8830b12 View commit details

  2. ghc*Binary: use $OBJCOPY when invoking objcopy (touchup musl fix) 

    (cherry picked from commit 93e3eec)
    @dtzWill
    dtzWill committed Mar 18, 2019
    Copy the full SHA
    ac40691 View commit details
Showing with 18 additions and 0 deletions.
  1. +9 −0 pkgs/development/compilers/ghc/8.2.2-binary.nix
  2. +9 −0 pkgs/development/compilers/ghc/8.6.3-binary.nix
9 changes: 9 additions & 0 deletions pkgs/development/compilers/ghc/8.2.2-binary.nix
View file
Original file line number Diff line number Diff line change
@@ -107,6 +107,15 @@ stdenv.mkDerivation rec {
sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
'' +
# We're kludging a glibc bindist into working with non-glibc...
# Here we patch up the use of `__strdup` (part of glibc binary ABI)
# to instead use `strdup` since musl doesn't provide __strdup
# (`__strdup` is defined to be an alias of `strdup` anyway[1]).
# [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html
# Use objcopy magic to make the change:
stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \;
'';

configurePlatforms = [ ];
9 changes: 9 additions & 0 deletions pkgs/development/compilers/ghc/8.6.3-binary.nix
View file
Original file line number Diff line number Diff line change
@@ -99,6 +99,15 @@ stdenv.mkDerivation rec {
sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
'' +
# We're kludging a glibc bindist into working with non-glibc...
# Here we patch up the use of `__strdup` (part of glibc binary ABI)
# to instead use `strdup` since musl doesn't provide __strdup
# (`__strdup` is defined to be an alias of `strdup` anyway[1]).
# [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html
# Use objcopy magic to make the change:
stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \;
'';

configurePlatforms = [ ];