treewide: NIX_*_COMPILE -> string

This commit is contained in:
Robin Gloster
2019-12-31 00:13:29 +01:00
committed by Jan Tojnar
parent ab0cfd9e03
commit 5f2b92e3ec
61 changed files with 73 additions and 111 deletions
+1 -4
View File
@@ -16,10 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libbfd libnl ncurses readline zlib ];
# To avoid running into https://sourceware.org/bugzilla/show_bug.cgi?id=14243 we need to define:
NIX_CFLAGS_COMPILE = [
"-DPACKAGE=${pname}"
"-DPACKAGE_VERSION=${version}"
];
NIX_CFLAGS_COMPILE = "-DPACKAGE=${pname} -DPACKAGE_VERSION=${version}";
enableParallelBuilding = true;
@@ -13,7 +13,7 @@ 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 = "-I${gnu-efi}/include/efi -Wno-error=address-of-packed-member";
# TODO: Just apply the disable to the efi subdir
hardeningDisable = [ "stackprotector" ];