diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 09:25:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 09:25:10 +0200 |
| commit | aa9a04883e34f6a7b89846e87654577d5b218f46 (patch) | |
| tree | 5bc2d586532b76c0248a9e3280ec7e333ef6d893 /pkgs/games/openspades | |
| parent | 21f9180d49d1d911668620f3d8897c1e1352672a (diff) | |
| download | nixpkgs-aa9a04883e34f6a7b89846e87654577d5b218f46.tar nixpkgs-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.gz nixpkgs-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.bz2 nixpkgs-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.lz nixpkgs-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.xz nixpkgs-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.zst nixpkgs-aa9a04883e34f6a7b89846e87654577d5b218f46.zip | |
Revert "Merge branch 'staging'" due to glibc
The main output started to retain dependency on bootstrap-tools; see https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096 This reverts commit c05d8295988697adbb920a7b4a999ae3670c5504, reversing changes made to f073df60d60444c30c49cb26d6b187a4100b41fe.
Diffstat (limited to 'pkgs/games/openspades')
| -rw-r--r-- | pkgs/games/openspades/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/games/openspades/git.nix | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 143fa21ce2e..2203bb6337e 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 7d76573f734..8212f160cda 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 ] |