diff options
| author | John Ericson <git@JohnEricson.me> | 2020-04-13 19:19:38 -0400 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2020-04-13 19:21:23 -0400 |
| commit | 17f2cf93dc3dfd49c7be85eee960994640b6f957 (patch) | |
| tree | d3967e73ff8a4ccd11c3429103a4bc810706c680 | |
| parent | 74f3b25896129f20f7af62fd7ccbb9fd1046761b (diff) | |
| download | nixpkgs-17f2cf93dc3dfd49c7be85eee960994640b6f957.tar nixpkgs-17f2cf93dc3dfd49c7be85eee960994640b6f957.tar.gz nixpkgs-17f2cf93dc3dfd49c7be85eee960994640b6f957.tar.bz2 nixpkgs-17f2cf93dc3dfd49c7be85eee960994640b6f957.tar.lz nixpkgs-17f2cf93dc3dfd49c7be85eee960994640b6f957.tar.xz nixpkgs-17f2cf93dc3dfd49c7be85eee960994640b6f957.tar.zst nixpkgs-17f2cf93dc3dfd49c7be85eee960994640b6f957.zip | |
fwupdate: Clean up -I flags
| -rw-r--r-- | pkgs/os-specific/linux/firmware/fwupdate/default.nix | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix index c14e04dc344..bcafa7f3376 100644 --- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupdate/default.nix @@ -1,6 +1,13 @@ { efivar, fetchurl, gettext, gnu-efi, libsmbios, pkgconfig, popt, stdenv }: + let version = "12"; + + arch = + if stdenv.hostPlatform.isx86_32 + then "ia32" + else stdenv.hostPlatform.parsed.cpu.name; + in stdenv.mkDerivation { pname = "fwupdate"; inherit version; @@ -13,7 +20,11 @@ in stdenv.mkDerivation { ./do-not-create-sharedstatedir.patch ]; - NIX_CFLAGS_COMPILE = "-I${gnu-efi}/include/efi -Wno-error=address-of-packed-member"; + NIX_CFLAGS_COMPILE = builtins.toString [ + "-I${gnu-efi}/include/efi" + "-I${gnu-efi}/include/efi/${arch}" + "-Wno-error=address-of-packed-member" + ]; # TODO: Just apply the disable to the efi subdir hardeningDisable = [ "stackprotector" ]; @@ -41,12 +52,6 @@ in stdenv.mkDerivation { efivar ]; - # TODO: fix wrt cross-compilation - preConfigure = '' - arch=$(cc -dumpmachine | cut -f1 -d- | sed 's,i[3456789]86,ia32,' ) - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gnu-efi}/include/efi/$arch" - ''; - postInstall = '' rm -rf $out/src rm -rf $out/lib/debug |