diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-02-01 17:05:25 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-02-01 17:05:25 +0100 |
| commit | 9e2af388274a7abf08633c5c21a29a7fc404b479 (patch) | |
| tree | bad8e40c5113bb6f4cdb918ff4b83554f460b9d2 /pkgs/tools/misc/wimboot | |
| parent | 249659872498abe765bbf29f3a799e904f02f7ac (diff) | |
| parent | a6afe649fe79c27fe90f6f9ab70bc2fe44fba1b9 (diff) | |
Merge branch 'staging' into staging-next
Diffstat (limited to 'pkgs/tools/misc/wimboot')
| -rw-r--r-- | pkgs/tools/misc/wimboot/default.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/tools/misc/wimboot/default.nix b/pkgs/tools/misc/wimboot/default.nix index 12c411f3ef438..267272b0b664a 100644 --- a/pkgs/tools/misc/wimboot/default.nix +++ b/pkgs/tools/misc/wimboot/default.nix @@ -13,18 +13,14 @@ stdenv.mkDerivation rec { sourceRoot = "source/src"; - # 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 ["-" "."] ["_" "_"] stdenv.hostPlatform.config}=$(< ${stdenv.cc}/nix-support/libc-cflags) - ''; - buildInputs = [ libbfd zlib libiberty ]; makeFlags = [ "wimboot.x86_64.efi" ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + installPhase = '' mkdir -p $out/share/wimboot/ cp wimboot.x86_64.efi $out/share/wimboot |