Merge NixOS#212919: ubootTools: fix build by fixing -idirafter ordering

...into staging-next
trofi · Jan 28, 2023 · 277d34f · 277d34f
2 parents 710d53b + 8b3a31f
commit 277d34f
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
@@ -92,6 +92,16 @@ let
 
     passAsFile = [ "extraConfig" ];
 
+    # Workaround '-idirafter' ordering bug in staging-next:
+    #   https://github.com/NixOS/nixpkgs/pull/210004
+    # where libc '-idirafter' gets added after user's idirafter and
+    # breaks.
+    # TODO(trofi): remove it in staging once fixed in cc-wrapper.
+    preConfigure = ''
+      export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] buildPackages.stdenv.hostPlatform.config}=$(< ${buildPackages.stdenv.cc}/nix-support/libc-cflags)
+      export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"]               stdenv.hostPlatform.config}=$(<               ${stdenv.cc}/nix-support/libc-cflags)
+    '';
+
     configurePhase = ''
       runHook preConfigure