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

treewide: NIX_*_COMPILE -> string

Browse Source
This commit is contained in:
Robin Gloster
2019-10-30 01:40:49 +01:00
committed by Jan Tojnar
parent 981ae25113
commit ab0cfd9e03
34 changed files with 51 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/graphics/appleseed/default.nix
View File

@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
osl seexpr makeWrapper
];
NIX_CFLAGS_COMPILE = [
NIX_CFLAGS_COMPILE = toString [
"-I${openexr.dev}/include/OpenEXR"
"-I${ilmbase.dev}/include/OpenEXR"
"-I${openimageio.dev}/include/OpenImageIO"

2
pkgs/tools/graphics/asymptote/default.nix
View File

@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
"--with-context=$out/share/texmf/tex/context/third"
];
NIX_CFLAGS_COMPILE = [ "-I${boehmgc.dev}/include/gc" ];
NIX_CFLAGS_COMPILE = "-I${boehmgc.dev}/include/gc";
postInstall = ''
mv $out/share/info/asymptote/*.info $out/share/info/

2
pkgs/tools/graphics/zbar/default.nix
View File

@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
];
# Disable assertions which include -dev QtBase file paths.
NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
NIX_CFLAGS_COMPILE = "-DQT_NO_DEBUG";
configureFlags = [
"--without-python"

3
pkgs/tools/networking/altermime/default.nix
View File

@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "15zxg6spcmd35r6xbidq2fgcg2nzyv1sbbqds08lzll70mqx4pj7";
};
NIX_CFLAGS_COMPILE = [ "-Wno-error=format"
NIX_CFLAGS_COMPILE = toString [
"-Wno-error=format"
"-Wno-error=format-truncation"
"-Wno-error=pointer-compare"
"-Wno-error=memset-elt-size"

2
pkgs/tools/networking/atinout/default.nix
View File

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "atinout-${version}";
version = "0.9.2-alpha";
NIX_CFLAGS_COMPILE = [ "-Werror=implicit-fallthrough=0" ];
NIX_CFLAGS_COMPILE = "-Werror=implicit-fallthrough=0";
LANG = "C.UTF-8";
nativeBuildInputs = [ ronn mount ];

2
pkgs/tools/video/mjpegtools/default.nix
View File

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libdv libjpeg libpng ]
++ lib.optionals (!withMinimal) [ gtk2 libX11 SDL SDL_gfx ];
NIX_CFLAGS_COMPILE = lib.optional (!withMinimal) "-I${SDL.dev}/include/SDL";
NIX_CFLAGS_COMPILE = lib.optionalString (!withMinimal) "-I${SDL.dev}/include/SDL";
postPatch = ''
sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure