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

Merge pull request #36810 from dtzWill/fix/glibc-with-musl 

glibc: patch to fix building w/musl-based stdenv
This commit is contained in:
Will Dietz 2018-03-11 14:52:09 -05:00 committed by GitHub
parent 880311a525 54c4c183dd
commit 0edb8f7b40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/glibc/common-2.27.nix
View File

@ -4,7 +4,7 @@
{ stdenv, lib { stdenv, lib
, buildPlatform, hostPlatform , buildPlatform, hostPlatform
, buildPackages , buildPackages
, fetchurl , fetchurl, fetchpatch ? null
, linuxHeaders ? null , linuxHeaders ? null
, gd ? null, libpng ? null , gd ? null, libpng ? null
, bison , bison
@ -78,7 +78,13 @@ stdenv.mkDerivation ({
*/ */
./allow-kernel-2.6.32.patch ./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 = postPatch =
'' ''

10
pkgs/development/libraries/glibc/common.nix
View File

@ -4,7 +4,7 @@
{ stdenv, lib { stdenv, lib
, buildPlatform, hostPlatform , buildPlatform, hostPlatform
, buildPackages , buildPackages
, fetchurl , fetchurl, fetchpatch ? null
, linuxHeaders ? null , linuxHeaders ? null
, gd ? null, libpng ? null , gd ? null, libpng ? null
}: }:
@ -88,7 +88,13 @@ stdenv.mkDerivation ({
*/ */
./allow-kernel-2.6.32.patch ./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 = postPatch =
# Needed for glibc to build with the gnumake 3.82 # Needed for glibc to build with the gnumake 3.82