diff options
author | Robin Gloster <mail@glob.in> | 2019-10-30 03:23:29 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 00:15:46 +0100 |
commit | f9f46dc327c7e659e84d558f1309e16e16e8245a (patch) | |
tree | f402e0b62191769e95e3199c3f635bb8ed7a6da3 /pkgs/development/interpreters | |
parent | 5f2b92e3eca8bd2d34d98e82d63783f281363f8f (diff) | |
download | nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.gz nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.bz2 nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.lz nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.xz nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.zst nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.zip |
treewide: NIX_*_FLAGS -> string
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/gnu-apl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/jimtcl/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/love/0.8.nix | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/love/11.1.nix | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index 94ec0244382..c2a3556cfea 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { buildInputs = [ readline gettext ncurses ]; # Needed with GCC 8 - NIX_CFLAGS_COMPILE = with stdenv.lib; (optionals stdenv.cc.isGNU [ + NIX_CFLAGS_COMPILE = with stdenv.lib; toString ((optionals stdenv.cc.isGNU [ "-Wno-error=int-in-bool-context" "-Wno-error=class-memaccess" "-Wno-error=restrict" "-Wno-error=format-truncation" - ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference"; + ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference"); patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h" diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index 09d7fa622fc..d803fe43fd7 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { "--ipv6" ]; - NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_gfx ]; + NIX_CFLAGS_COMPILE = toString (makeSDLFlags [ SDL SDL_gfx ]); enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix index 57c1a6ce564..3a6c385ee5f 100644 --- a/pkgs/development/interpreters/love/0.8.nix +++ b/pkgs/development/interpreters/love/0.8.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { } || true ''; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-I${SDL.dev}/include/SDL" "-I${freetype.dev}include/freetype2" "-DGL_GLEXT_PROTOTYPES" # https://community.khronos.org/t/glgenbuffers-was-not-declared-in-this-scope/59283/2 diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix index 0a60a4cacfe..3629345baf6 100644 --- a/pkgs/development/interpreters/love/11.1.nix +++ b/pkgs/development/interpreters/love/11.1.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { "--with-lua=luajit" ]; - NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 + NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 meta = { homepage = http://love2d.org; |