diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-01-29 07:34:10 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2023-01-29 07:49:37 +0000 |
| commit | 58ddf90bfa080e4a1c0ddda7435dfe4d9931a0a7 (patch) | |
| tree | ffb37686cafa1d0d4fe63588552326fb44fa8cc7 | |
| parent | 25206ed9a89083889f386f8cd3c5a5a2611a5301 (diff) | |
| download | nixpkgs-58ddf90bfa080e4a1c0ddda7435dfe4d9931a0a7.tar nixpkgs-58ddf90bfa080e4a1c0ddda7435dfe4d9931a0a7.tar.gz nixpkgs-58ddf90bfa080e4a1c0ddda7435dfe4d9931a0a7.tar.bz2 nixpkgs-58ddf90bfa080e4a1c0ddda7435dfe4d9931a0a7.tar.lz nixpkgs-58ddf90bfa080e4a1c0ddda7435dfe4d9931a0a7.tar.xz nixpkgs-58ddf90bfa080e4a1c0ddda7435dfe4d9931a0a7.tar.zst nixpkgs-58ddf90bfa080e4a1c0ddda7435dfe4d9931a0a7.zip | |
ipxe: revert "fix build by fixing -idirafter ordering"
This reverts commit a9e6a5c1bc8223d77ca110b3d3987194803dcddf.
commit 8c80bd08b7e39229947d55104d1871f5066437d9
("build-support/cc-wrapper: pass in non-existent --sysroot= to untangle
from libc") was reverted. We can drop the workaround.
| -rw-r--r-- | pkgs/tools/misc/ipxe/default.nix | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 65c88eac4e8..c3a0c5aa906 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -48,16 +48,6 @@ stdenv.mkDerivation rec { substituteInPlace src/util/genfsimg --replace " syslinux " " true " ''; # calling syslinux on a FAT image isn't going to work - # 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) - ''; - # not possible due to assembler code hardeningDisable = [ "pic" "stackprotector" ]; |