From 27ec2df59eb0d69883f696b217994157f837cd3f Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Fri, 26 Jan 2018 21:42:20 +0900 Subject: cataclysm-dda{,-git}: clean up - Remove cmath include (introduced by 97c484a) since the current gcc/clang works fine without it. - Suppress known compiler warnings instead of removing -Werror flag. --- pkgs/games/cataclysm-dda/default.nix | 10 +++++----- pkgs/games/cataclysm-dda/git.nix | 5 ----- 2 files changed, 5 insertions(+), 10 deletions(-) (limited to 'pkgs/games/cataclysm-dda') diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index be6f3265430..541b174cc6a 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -22,11 +22,6 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . - sed -i Makefile \ - -e 's,-Werror,,g' - - sed '1i#include ' \ - -i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp ''; makeFlags = [ @@ -35,6 +30,11 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals stdenv.isDarwin [ "NATIVE=osx CLANG=1" "OSX_MIN=10.6" # SDL for macOS only supports deploying on 10.6 and above + ] ++ stdenv.lib.optionals stdenv.cc.isGNU [ + "WARNINGS+=-Wno-deprecated-declarations" + "WARNINGS+=-Wno-ignored-attributes" + ] ++ stdenv.lib.optionals stdenv.cc.isClang [ + "WARNINGS+=-Wno-inconsistent-missing-override" ]; postBuild = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index 3d8ec7d6844..ac2c1f9fdb1 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -21,11 +21,6 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . - sed -i Makefile \ - -e 's,-Werror,,g' - - sed '1i#include ' \ - -i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp ''; makeFlags = [ -- cgit 1.4.1