JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fwupdate: Clean up -I flags

Browse Source
This commit is contained in:
John Ericson 2020-04-13 19:19:38 -04:00
parent 74f3b25896
commit 17f2cf93dc
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/os-specific/linux/firmware/fwupdate/default.nix
View File

@ -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