treewide: NIX_*_COMPILE -> string

This commit is contained in:
Robin Gloster
2019-12-31 00:07:21 +01:00
committed by Jan Tojnar
parent e5ded57aab
commit 981ae25113
11 changed files with 17 additions and 19 deletions
+1 -4
View File
@@ -88,10 +88,7 @@ stdenv.mkDerivation rec {
# These are the defines that'd you'd get with --enable-debug=minimum (default).
# See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options
NIX_CFLAGS_COMPILE = [
"-DG_ENABLE_DEBUG"
"-DG_DISABLE_CAST_CHECKS"
];
NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
postPatch = ''
files=(
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ automake autoconf libtool which ];
NIX_CFLAGS_LINK = [ "-pthread" ];
NIX_CFLAGS_LINK = "-pthread";
patches = [
./bootstrap.patch
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
(if x11Support then "--enable-x11" else "--disable-x11")
];
NIX_CFLAGS_COMPILE = stdenv.lib.optional (!x11Support) "-DX_DISPLAY_MISSING";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING";
enableParallelBuilding = true;
propagatedBuildInputs = [ ncurses zlib pkgconfig (imlib2.override { inherit x11Support; }) ]
++ stdenv.lib.optionals x11Support [ libX11 libXext];
++ stdenv.lib.optionals x11Support [ libX11 libXext ];
postInstall = ''
mkdir -p $dev/bin
+1 -1
View File
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
--prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig"
'';
NIX_LDFLAGS = [ "-lX11" ];
NIX_LDFLAGS = "-lX11";
meta = {
homepage = http://icculus.org/smpeg/;