diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-02-24 14:23:48 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-02-24 14:29:35 +0100 |
| commit | 301d1d9e76d4ec470a60761f61019e63d1c59ee7 (patch) | |
| tree | 1aa67574eaf77c0b447ed0ca85008fcf26384a25 /pkgs/games/hedgewars | |
| parent | e2af876c78d2b5ad8fd9b2e07b59a3444da98e05 (diff) | |
| download | nixpkgs-301d1d9e76d4ec470a60761f61019e63d1c59ee7.tar nixpkgs-301d1d9e76d4ec470a60761f61019e63d1c59ee7.tar.gz nixpkgs-301d1d9e76d4ec470a60761f61019e63d1c59ee7.tar.bz2 nixpkgs-301d1d9e76d4ec470a60761f61019e63d1c59ee7.tar.lz nixpkgs-301d1d9e76d4ec470a60761f61019e63d1c59ee7.tar.xz nixpkgs-301d1d9e76d4ec470a60761f61019e63d1c59ee7.tar.zst nixpkgs-301d1d9e76d4ec470a60761f61019e63d1c59ee7.zip | |
hedgewars: 0.9.21 -> 0.9.22, fix build failure
cc @kragniz
Diffstat (limited to 'pkgs/games/hedgewars')
| -rw-r--r-- | pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch | 36 | ||||
| -rw-r--r-- | pkgs/games/hedgewars/default.nix | 8 |
2 files changed, 3 insertions, 41 deletions
diff --git a/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch b/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch deleted file mode 100644 index 1de99542bdb..00000000000 --- a/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index f5d4627c5c0..8d601e29d0b 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -5,15 +5,15 @@ let ghc = ghcWithPackages (pkgs: with pkgs; [ - network vector utf8-string bytestring-show random hslogger dataenc SHA entropy zlib + network vector utf8-string bytestring-show random hslogger dataenc SHA entropy zlib_0_5_4_2 ]); in stdenv.mkDerivation rec { - version = "0.9.21"; + version = "0.9.22"; name = "hedgewars-${version}"; src = fetchurl { url = "http://download.gna.org/hedgewars/hedgewars-src-${version}.tar.bz2"; - sha256 = "0abnzpyq6sxlfcz5b0kh6r7n1692dwrgsdsr4s216xhh9n19xm0w"; + sha256 = "14i1wvqbqib9h9092z10g4g0y14r5sp2fdaksvnw687l3ybwi6dn"; }; buildInputs = [ @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { qt4 ghc ffmpeg freeglut makeWrapper physfs ]; - patches = [ ./21eb5b79072b147d0a9b7fafca98501e7056c834.patch ]; - preBuild = '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL_image}/lib -rpath ${SDL_mixer}/lib |