summary refs log tree commit diff
path: root/pkgs/games/hedgewars
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2015-08-28 17:09:26 +0200
committerDomen Kožar <domen@dev.si>2015-08-28 17:09:35 +0200
commit93e8a121c8438f739157f819f051c2a493b9874f (patch)
tree4e4731fcd20f492509f5cf3774a5ea24b2249f2f /pkgs/games/hedgewars
parent89cec3c895030f37fd0c9db7f95fef507826bd84 (diff)
downloadnixpkgs-93e8a121c8438f739157f819f051c2a493b9874f.tar
nixpkgs-93e8a121c8438f739157f819f051c2a493b9874f.tar.gz
nixpkgs-93e8a121c8438f739157f819f051c2a493b9874f.tar.bz2
nixpkgs-93e8a121c8438f739157f819f051c2a493b9874f.tar.lz
nixpkgs-93e8a121c8438f739157f819f051c2a493b9874f.tar.xz
nixpkgs-93e8a121c8438f739157f819f051c2a493b9874f.tar.zst
nixpkgs-93e8a121c8438f739157f819f051c2a493b9874f.zip
hedgewars: add missing patch
Diffstat (limited to 'pkgs/games/hedgewars')
-rw-r--r--pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch b/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch
new file mode 100644
index 00000000000..1de99542bdb
--- /dev/null
+++ b/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch
@@ -0,0 +1,36 @@
+From 21eb5b79072b147d0a9b7fafca98501e7056c834 Mon Sep 17 00:00:00 2001
+From: koda <vittorio.giovara@gmail.com>
+Date: Tue, 2 Jun 2015 19:51:04 +0100
+Subject: [PATCH] Fix building hedgewars-server
+
+---
+ gameServer/CoreTypes.hs           | 2 +-
+ gameServer/hedgewars-server.cabal | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gameServer/CoreTypes.hs b/gameServer/CoreTypes.hs
+index 553e722..2c75153 100644
+--- a/gameServer/CoreTypes.hs
++++ b/gameServer/CoreTypes.hs
+@@ -38,7 +38,7 @@ import RoomsAndClients
+ instance NFData B.ByteString
+ #endif
+ 
+-instance NFData (Chan a)
++instance NFData (Chan a) where rnf a  = ()
+ 
+ instance NFData Action where
+     rnf (AnswerClients chans msg) = chans `deepseq` msg `deepseq` ()
+diff --git a/gameServer/hedgewars-server.cabal b/gameServer/hedgewars-server.cabal
+index 122f2ef..f36a190 100644
+--- a/gameServer/hedgewars-server.cabal
++++ b/gameServer/hedgewars-server.cabal
+@@ -33,7 +33,7 @@ Executable hedgewars-server
+     utf8-string,
+     SHA,
+     entropy,
+-    zlib
++    zlib >= 0.5.3 && < 0.6
+ 
+   if !os(windows)
+     build-depends: unix