From 82644c15e572e3f2739c5f78d05bf2f69e992e58 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 11 Mar 2018 10:53:31 -0500
Subject: [PATCH 1/2] glibc: patch to fix building w/musl-based stdenv
See:
https://sourceware.org/bugzilla/show_bug.cgi?id=21604
---
pkgs/development/libraries/glibc/common-2.27.nix | 10 ++++++++--
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..9748d8379384 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 d40733adf874..90cea5b7396e 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
From 54c4c183dd999776e6274d95a18a94f542687f02 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 11 Mar 2018 11:16:53 -0500
Subject: [PATCH 2/2] glibc: make fetchpatch optional ("? null"), just in case.
---
pkgs/development/libraries/glibc/common-2.27.nix | 2 +-
pkgs/development/libraries/glibc/common.nix | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/glibc/common-2.27.nix b/pkgs/development/libraries/glibc/common-2.27.nix
index 9748d8379384..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, fetchpatch
+, fetchurl, fetchpatch ? null
, linuxHeaders ? null
, gd ? null, libpng ? null
, bison
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 90cea5b7396e..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, fetchpatch
+, fetchurl, fetchpatch ? null
, linuxHeaders ? null
, gd ? null, libpng ? null
}: