summary refs log tree commit diff
diff options
context:
space:
mode:
authorSamuel Leathers <disasm@gmail.com>2017-09-08 09:08:00 -0400
committerRobin Gloster <mail@glob.in>2017-09-08 15:08:00 +0200
commitdc15c153381377088b497e515f8725118cfc0926 (patch)
tree0e0be8d67a8d8050c6f21f1a70efab3fd06d2f55
parentcd283e9234667de526e0d055e7f4108ec535b941 (diff)
downloadnixpkgs-dc15c153381377088b497e515f8725118cfc0926.tar
nixpkgs-dc15c153381377088b497e515f8725118cfc0926.tar.gz
nixpkgs-dc15c153381377088b497e515f8725118cfc0926.tar.bz2
nixpkgs-dc15c153381377088b497e515f8725118cfc0926.tar.lz
nixpkgs-dc15c153381377088b497e515f8725118cfc0926.tar.xz
nixpkgs-dc15c153381377088b497e515f8725118cfc0926.tar.zst
nixpkgs-dc15c153381377088b497e515f8725118cfc0926.zip
scorched3d: fixing build with gcc6
-rw-r--r--pkgs/games/scorched3d/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix
index be921bf1189..0c2952696e2 100644
--- a/pkgs/games/scorched3d/default.nix
+++ b/pkgs/games/scorched3d/default.nix
@@ -16,7 +16,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  patches = [ ./file-existence.patch ];
+  patches = [
+    ./file-existence.patch
+    (fetchurl {
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch?id=1bbcfc9ae3dfdfcbdd35151cb7b6050776215e4d";
+      sha256 = "1farmjxbc2wm4scsdbdnvh29fipnb6mp6z85hxz4bx6n9kbc8y7n";
+    })
+  ];
 
   sourceRoot = "scorched";