public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge branch 'staging'" due to glibc

Browse Source 
The main output started to retain dependency on bootstrap-tools; see
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096

This reverts commit c05d829598, reversing
changes made to f073df60d6.
This commit is contained in:
Vladimír Čunát
2016-06-23 09:25:10 +02:00
parent 21f9180d49
commit aa9a04883e
51 changed files with 201 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/games/openspades/default.nix
+1 -5
View File
@@ -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 =