diff options
| author | Robin Gloster <mail@glob.in> | 2019-10-30 01:12:09 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 00:07:21 +0100 |
| commit | 981ae25113c13b7989e89b8b57be25d9e186a63e (patch) | |
| tree | 157004ea82ccdd23980e8e4ae7d17831e08e5bcc /pkgs/development/libraries | |
| parent | e5ded57aabe97617a7ca2b67494cdbc1d0fdedba (diff) | |
| download | nixpkgs-981ae25113c13b7989e89b8b57be25d9e186a63e.tar nixpkgs-981ae25113c13b7989e89b8b57be25d9e186a63e.tar.gz nixpkgs-981ae25113c13b7989e89b8b57be25d9e186a63e.tar.bz2 nixpkgs-981ae25113c13b7989e89b8b57be25d9e186a63e.tar.lz nixpkgs-981ae25113c13b7989e89b8b57be25d9e186a63e.tar.xz nixpkgs-981ae25113c13b7989e89b8b57be25d9e186a63e.tar.zst nixpkgs-981ae25113c13b7989e89b8b57be25d9e186a63e.zip | |
treewide: NIX_*_COMPILE -> string
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/gtk/3.x.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/ilmbase/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libcaca/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/smpeg/default.nix | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 7f09b52d51f..5a2d9159cac 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -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=( diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index a25a590b370..00cdda1e570 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -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 diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 8949ea8e390..7773fe46c0c 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -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 diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index a7ffc146f41..4d74ee7ca06 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -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/; |