diff options
| author | Will Dietz <github@wdtz.org> | 2018-03-11 14:52:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-11 14:52:09 -0500 |
| commit | 0edb8f7b4082644aa0ad2a1bcd6ca866d2492f74 (patch) | |
| tree | 2e4583686f6302ab3c5244231b1d5a6f153a4d12 /pkgs/development | |
| parent | 880311a5258e2d97d2143312da450ef6881256fa (diff) | |
| parent | 54c4c183dd999776e6274d95a18a94f542687f02 (diff) | |
| download | nixlib-0edb8f7b4082644aa0ad2a1bcd6ca866d2492f74.tar nixlib-0edb8f7b4082644aa0ad2a1bcd6ca866d2492f74.tar.gz nixlib-0edb8f7b4082644aa0ad2a1bcd6ca866d2492f74.tar.bz2 nixlib-0edb8f7b4082644aa0ad2a1bcd6ca866d2492f74.tar.lz nixlib-0edb8f7b4082644aa0ad2a1bcd6ca866d2492f74.tar.xz nixlib-0edb8f7b4082644aa0ad2a1bcd6ca866d2492f74.tar.zst nixlib-0edb8f7b4082644aa0ad2a1bcd6ca866d2492f74.zip | |
Merge pull request #36810 from dtzWill/fix/glibc-with-musl
glibc: patch to fix building w/musl-based stdenv
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/glibc/common-2.27.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/development/libraries/glibc/common-2.27.nix b/pkgs/development/libraries/glibc/common-2.27.nix index 6c443ebbb932..4a5b31245c1c 100644 --- a/pkgs/development/libraries/glibc/common-2.27.nix +++ b/pkgs/development/libraries/glibc/common-2.27.nix @@ -4,7 +4,7 @@ { stdenv, lib , buildPlatform, hostPlatform , buildPackages -, fetchurl +, fetchurl, fetchpatch ? null , linuxHeaders ? null , gd ? null, libpng ? null , bison @@ -78,7 +78,13 @@ stdenv.mkDerivation ({ */ ./allow-kernel-2.6.32.patch ] - ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch; + ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch + ++ lib.optional stdenv.hostPlatform.isMusl + (fetchpatch { + name = "fix-with-musl.patch"; + url = "https://sourceware.org/bugzilla/attachment.cgi?id=10151&action=diff&collapsed=&headers=1&format=raw"; + sha256 = "18kk534k6da5bkbsy1ivbi77iin76lsna168mfcbwv4ik5vpziq2"; + }); postPatch = '' diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index d40733adf874..c8e5b4562856 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -4,7 +4,7 @@ { stdenv, lib , buildPlatform, hostPlatform , buildPackages -, fetchurl +, fetchurl, fetchpatch ? null , linuxHeaders ? null , gd ? null, libpng ? null }: @@ -88,7 +88,13 @@ stdenv.mkDerivation ({ */ ./allow-kernel-2.6.32.patch ] - ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch; + ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch + ++ lib.optional stdenv.hostPlatform.isMusl + (fetchpatch { + name = "fix-with-musl.patch"; + url = "https://sourceware.org/bugzilla/attachment.cgi?id=10151&action=diff&collapsed=&headers=1&format=raw"; + sha256 = "18kk534k6da5bkbsy1ivbi77iin76lsna168mfcbwv4ik5vpziq2"; + }); postPatch = # Needed for glibc to build with the gnumake 3.82 |