diff options
| author | Aneesh Agrawal <aneeshusa@gmail.com> | 2016-08-25 17:11:27 -0400 |
|---|---|---|
| committer | Jörg Thalheim <joerg@higgsboson.tk> | 2016-10-01 16:13:41 +0200 |
| commit | fcee1d0b28aa0f45f559d38659fd2a11cd34dafe (patch) | |
| tree | 809af78a8471b509b0e0516df1d2fbb5817a4b83 /pkgs/games/openspades | |
| parent | 0e3e7a6bcd96405ddc257b93d57cda09b558cbdb (diff) | |
Remove redundant -DCMAKE_BUILD_TYPE=Release flags
Since commit 183d05a0 in 2012, this is the default. fixes #18000
Diffstat (limited to 'pkgs/games/openspades')
| -rw-r--r-- | pkgs/games/openspades/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/games/openspades/git.nix | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 143fa21ce2e5f..0438b687a1b97 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -23,11 +23,14 @@ stdenv.mkDerivation rec { sed '1i#include <math.h>' -i Sources/Draw/SWFeatureLevel.h ''; - nativeBuildInputs = + nativeBuildInputs = [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ] ++ lib.optional withOpenal openal; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" "-DOPENSPADES_RESOURCES=NO" ]; + cmakeFlags = [ + "-DOPENSPADES_INSTALL_BINARY=bin" + "-DOPENSPADES_RESOURCES=NO" + ]; enableParallelBuilding = true; diff --git a/pkgs/games/openspades/git.nix b/pkgs/games/openspades/git.nix index 7d76573f73452..9e3d4ac5b64ca 100644 --- a/pkgs/games/openspades/git.nix +++ b/pkgs/games/openspades/git.nix @@ -16,12 +16,15 @@ stdenv.mkDerivation rec { postPatch = "sed '1i#include <cmath>' -i Sources/Client/{,Client}Player.cpp"; - nativeBuildInputs = + nativeBuildInputs = with stdenv.lib; [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ] ++ lib.optional withOpenal openal; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" "-DOPENSPADES_RESOURCES=NO" ]; + cmakeFlags = [ + "-DOPENSPADES_INSTALL_BINARY=bin" + "-DOPENSPADES_RESOURCES=NO" + ]; #enableParallelBuilding = true; |