From 65eb7fe785c5c49b2dd57641f00a37ec8908fdac Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:18:25 +0100 Subject: cataclysm-dda: fix build with gcc9 --- pkgs/games/cataclysm-dda/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/games') diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index b1d8a27b5a22..9f34c60e16cb 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation (common // rec { substituteInPlace lua/autoexec.lua --replace "/usr/share" "$out/share" ''; + NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-copy" ]; + makeFlags = common.makeFlags ++ [ "LUA=1" ]; -- cgit 1.4.1 From 43442880cf6c48fae6e65bb8fdab3717c080a7fb Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Dec 2019 05:12:49 +0100 Subject: cataclysm-dda: fix build on darwin --- pkgs/games/cataclysm-dda/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/games') diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index 9f34c60e16cb..ced19bffb31a 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (common // rec { substituteInPlace lua/autoexec.lua --replace "/usr/share" "$out/share" ''; - NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-copy" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy"; makeFlags = common.makeFlags ++ [ "LUA=1" -- cgit 1.4.1