diff options
| author | Domen Kožar <domen@dev.si> | 2015-08-28 13:59:47 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-08-28 14:00:17 +0200 |
| commit | 01587f02a2eee51385145d361c77d12925e4ebbb (patch) | |
| tree | 93b1a822d64112453ef547fab6b5557c88d81354 /pkgs/games/hedgewars | |
| parent | eb4ba90ef80e6b5c2ece41a134d6d8615fd7ef3e (diff) | |
| download | nixpkgs-01587f02a2eee51385145d361c77d12925e4ebbb.tar nixpkgs-01587f02a2eee51385145d361c77d12925e4ebbb.tar.gz nixpkgs-01587f02a2eee51385145d361c77d12925e4ebbb.tar.bz2 nixpkgs-01587f02a2eee51385145d361c77d12925e4ebbb.tar.lz nixpkgs-01587f02a2eee51385145d361c77d12925e4ebbb.tar.xz nixpkgs-01587f02a2eee51385145d361c77d12925e4ebbb.tar.zst nixpkgs-01587f02a2eee51385145d361c77d12925e4ebbb.zip | |
hedgewars: 0.9.20.5 -> 0.9.21, fix build
(cherry picked from commit 199be0273eb347a432d74cd50d9ef6083c73c1dd) Signed-off-by: Domen Kožar <domen@dev.si>
Diffstat (limited to 'pkgs/games/hedgewars')
| -rw-r--r-- | pkgs/games/hedgewars/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index bb776a7a10d..b92a14d84c2 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,27 +1,27 @@ { SDL_image, SDL_ttf, SDL_net, fpc, qt4, ghcWithPackages, ffmpeg, freeglut , stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL, SDL_mixer -, zlib, libpng, mesa +, zlib, libpng, mesa, physfs }: let ghc = ghcWithPackages (pkgs: with pkgs; [ - network vector utf8-string bytestring-show random hslogger dataenc + network vector utf8-string bytestring-show random hslogger dataenc SHA entropy zlib_0_5_4_2 ]); in stdenv.mkDerivation rec { - version = "0.9.20.5"; + version = "0.9.21"; name = "hedgewars-${version}"; src = fetchurl { url = "http://download.gna.org/hedgewars/hedgewars-src-${version}.tar.bz2"; - sha256 = "1k5dq14s9pshrqlz8vnix237bcapfif4k3rc4yj4cmwdx1pqkl56"; + sha256 = "0abnzpyq6sxlfcz5b0kh6r7n1692dwrgsdsr4s216xhh9n19xm0w"; }; buildInputs = [ SDL_ttf SDL_net cmake pkgconfig lua5_1 SDL SDL_mixer SDL_image fpc - qt4 ghc ffmpeg freeglut makeWrapper + qt4 ghc ffmpeg freeglut makeWrapper physfs ]; - patches = [ ./fix-ghc-7.8-build-failure.diff ]; + patches = [ ./21eb5b79072b147d0a9b7fafca98501e7056c834.patch ]; preBuild = '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL_image}/lib @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${mesa}/lib/:${freeglut}/lib + wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${mesa}/lib/:${freeglut}/lib:${physfs}/lib ''; meta = with stdenv.lib; { |