summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2022-10-06 12:59:29 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2023-03-29 09:50:26 +0200
commit2a2cd02cb650300010b74e1de92def52e36e9d13 (patch)
tree527acf62def5f5b4e22aefea48a54246f74911cf
parent9bb6dc1bc3cffbabc78f8df337d241f070604590 (diff)
downloadnixpkgs-2a2cd02cb650300010b74e1de92def52e36e9d13.tar
nixpkgs-2a2cd02cb650300010b74e1de92def52e36e9d13.tar.gz
nixpkgs-2a2cd02cb650300010b74e1de92def52e36e9d13.tar.bz2
nixpkgs-2a2cd02cb650300010b74e1de92def52e36e9d13.tar.lz
nixpkgs-2a2cd02cb650300010b74e1de92def52e36e9d13.tar.xz
nixpkgs-2a2cd02cb650300010b74e1de92def52e36e9d13.tar.zst
nixpkgs-2a2cd02cb650300010b74e1de92def52e36e9d13.zip
gcc49: fix build w/glibc-2.36
Failing Hydra build: https://hydra.nixos.org/build/193330218
-rw-r--r--pkgs/development/compilers/gcc/4.9/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index d966b75d377..90880752ca7 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -60,7 +60,8 @@ let majorVersion = "4";
     inherit (stdenv) buildPlatform hostPlatform targetPlatform;
 
     patches =
-      [ ../use-source-date-epoch.patch ../parallel-bconfig.patch ./parallel-strsignal.patch
+      [ ../9/fix-struct-redefinition-on-glibc-2.36.patch ../use-source-date-epoch.patch
+        ../parallel-bconfig.patch ./parallel-strsignal.patch
         ./libsanitizer.patch
         (fetchpatch {
           name = "avoid-ustat-glibc-2.28.patch";