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

Merge pull request #85190 from Ericson2314/fwupdate

Browse Source 
fwupdate: Clean up -I flags
This commit is contained in:
John Ericson 2020-04-17 18:50:22 -04:00 committed by GitHub
commit e99a409065
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 }: { efivar, fetchurl, gettext, gnu-efi, libsmbios, pkgconfig, popt, stdenv }:
let let
version = "12"; version = "12";
arch =
if stdenv.hostPlatform.isx86_32
then "ia32"
else stdenv.hostPlatform.parsed.cpu.name;
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "fwupdate"; pname = "fwupdate";
inherit version; inherit version;
@ -13,7 +20,11 @@ in stdenv.mkDerivation {
./do-not-create-sharedstatedir.patch ./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 # TODO: Just apply the disable to the efi subdir
hardeningDisable = [ "stackprotector" ]; hardeningDisable = [ "stackprotector" ];
@ -41,12 +52,6 @@ in stdenv.mkDerivation {
efivar 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 = '' postInstall = ''
rm -rf $out/src rm -rf $out/src
rm -rf $out/lib/debug rm -rf $out/lib/debug