diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2022-05-23 20:17:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-23 20:17:48 +0200 |
| commit | dd0b96be195f248851a02a0c6b8e53ea3f88b35a (patch) | |
| tree | 39c0af10fc1a1712a72d077b48ef7a3a3adbad40 /pkgs/development/libraries/glibc/common.nix | |
| parent | fc9784b2f1b2f528403564b8995cd0aad22b75e1 (diff) | |
| parent | 3c211fb5915a5984639e4ed61824c2aa2234bec6 (diff) | |
| download | nixpkgs-dd0b96be195f248851a02a0c6b8e53ea3f88b35a.tar nixpkgs-dd0b96be195f248851a02a0c6b8e53ea3f88b35a.tar.gz nixpkgs-dd0b96be195f248851a02a0c6b8e53ea3f88b35a.tar.bz2 nixpkgs-dd0b96be195f248851a02a0c6b8e53ea3f88b35a.tar.lz nixpkgs-dd0b96be195f248851a02a0c6b8e53ea3f88b35a.tar.xz nixpkgs-dd0b96be195f248851a02a0c6b8e53ea3f88b35a.tar.zst nixpkgs-dd0b96be195f248851a02a0c6b8e53ea3f88b35a.zip | |
Merge pull request #173893 from trofi/fix-glibc-for-gnat6
glibc: apply pending PR29162 to unbreak gnat6
Diffstat (limited to 'pkgs/development/libraries/glibc/common.nix')
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 9ba56ae5c61..b9933edcb59 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -134,6 +134,14 @@ stdenv.mkDerivation ({ url = "https://patchwork.sourceware.org/project/glibc/patch/20220314175316.3239120-2-sam@gentoo.org/raw/"; sha256 = "sq0BoPqXHQ69Vq4zJobCspe4XRfnAiuac/wqzVQJESc="; }) + + /* Patch pending upstream inclusion to fix string.h syntax for older gcc. + Needed to unbreak gnat bootstrap against old gcc in nixpkgs: + https://patchwork.sourceware.org/project/glibc/patch/20220520150609.346566-1-slyfox@gentoo.org/ */ + (fetchurl { + url = "https://patchwork.sourceware.org/project/glibc/patch/20220520150609.346566-1-slyfox@gentoo.org/raw/"; + sha256 = "x3/eO1EHJXBIrH2WXHRRD1swtWv+btFVjvMt5tj/wDA="; + }) ] ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; |