diff options
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/cataclysm-dda/default.nix | 3 | ||||
-rw-r--r-- | pkgs/games/dwarf-fortress/dfhack/default.nix | 1 | ||||
-rw-r--r-- | pkgs/games/dwarf-fortress/unfuck.nix | 2 | ||||
-rw-r--r-- | pkgs/games/openspades/default.nix | 6 | ||||
-rw-r--r-- | pkgs/games/openspades/git.nix | 2 | ||||
-rw-r--r-- | pkgs/games/the-butterfly-effect/default.nix | 3 |
6 files changed, 1 insertions, 16 deletions
diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index b46114ec62bea..3956c994531e3 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -21,9 +21,6 @@ stdenv.mkDerivation rec { sed -i Makefile \ -e 's,-Werror,,g' \ -e 's,\(DATA_PREFIX=$(PREFIX)/share/\)cataclysm-dda/,\1,g' - - sed '1i#include <cmath>' \ - -i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp ''; makeFlags = "PREFIX=$(out) LUA=1 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1"; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 1ee0f829571db..3d3b1c4d9aa80 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -39,7 +39,6 @@ in stdenv.mkDerivation rec { }; patches = [ ./use-system-libraries.patch ]; - postPatch = "sed '1i#include <math.h>' -i plugins/3dveins.cpp"; nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; # we can't use native Lua; upstream uses private headers diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 5b2327c2ff54f..1d6ea1196dabb 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation { sha256 = "12bqh3k4wsk1c0bz2zly8h0ilbsdmsbwr9cdjc6i7liwg9906g7i"; }; - postPatch = "sed '1i#include <math.h>' -i g_src/ttf_manager.cpp"; - cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 143fa21ce2e5f..2203bb6337eb4 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -16,11 +16,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Sources/Client/Client_Input.cpp --replace "isnan(" "std::isnan(" substituteInPlace Sources/Client/Corpse.cpp --replace "isnan(" "std::isnan(" - substituteInPlace Sources/Draw/SWMapRenderer.cpp \ - --replace "isnan(" "std::isnan(" --replace "isinf(" "std::isinf(" - sed '1i#include <cmath>' -i Sources/Client/{Player,Client_Input,Corpse}.cpp \ - -i Sources/Draw/SWMapRenderer.cpp - sed '1i#include <math.h>' -i Sources/Draw/SWFeatureLevel.h + substituteInPlace Sources/Draw/SWMapRenderer.cpp --replace "isnan(" "std::isnan(" --replace "isinf(" "std::isinf(" ''; nativeBuildInputs = diff --git a/pkgs/games/openspades/git.nix b/pkgs/games/openspades/git.nix index 7d76573f73452..8212f160cda83 100644 --- a/pkgs/games/openspades/git.nix +++ b/pkgs/games/openspades/git.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { sha256 = "0vyvmgim03q8pcmfa1i0njr4w1lpjq5g3b47f67v9b5c5jcjycwn"; }; - postPatch = "sed '1i#include <cmath>' -i Sources/Client/{,Client}Player.cpp"; - nativeBuildInputs = with stdenv.lib; [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ] diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index 68114bb75652c..7cd54b1b65b3b 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -10,13 +10,10 @@ stdenv.mkDerivation rec { sha256 = "1ag2cp346f9bz9qy6za6q54id44d2ypvkyhvnjha14qzzapwaysj"; }; - postPatch = "sed '1i#include <vector>' -i src/model/World.h"; - buildInputs = [ qt5.qtbase qt5.qtsvg qt5.qttranslations box2d which cmake gettext ]; - enableParallelBuilding = true; installPhase = '' make DESTDIR=.. install |