diff options
| author | Will Dietz <w@wdtz.org> | 2018-03-11 10:53:31 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-03-11 10:53:31 -0500 |
| commit | 82644c15e572e3f2739c5f78d05bf2f69e992e58 (patch) | |
| tree | d0dc9a75f530fb0f59d13b7a9a82333f6a15f079 /pkgs/development/libraries/glibc | |
| parent | c9edda809d398244e070e0b2302e6d22abc456a8 (diff) | |
| download | nixpkgs-82644c15e572e3f2739c5f78d05bf2f69e992e58.tar nixpkgs-82644c15e572e3f2739c5f78d05bf2f69e992e58.tar.gz nixpkgs-82644c15e572e3f2739c5f78d05bf2f69e992e58.tar.bz2 nixpkgs-82644c15e572e3f2739c5f78d05bf2f69e992e58.tar.lz nixpkgs-82644c15e572e3f2739c5f78d05bf2f69e992e58.tar.xz nixpkgs-82644c15e572e3f2739c5f78d05bf2f69e992e58.tar.zst nixpkgs-82644c15e572e3f2739c5f78d05bf2f69e992e58.zip | |
glibc: patch to fix building w/musl-based stdenv
See: https://sourceware.org/bugzilla/show_bug.cgi?id=21604
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -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 6c443ebbb93..9748d837938 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 , 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 d40733adf87..90cea5b7396 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 , 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 |