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

hedgewars: 0.9.20.5 -> 0.9.21, fix build

Browse Source 
(cherry picked from commit 199be0273eb347a432d74cd50d9ef6083c73c1dd)
Signed-off-by: Domen Kožar <domen@dev.si>
This commit is contained in:
Domen Kožar 2015-08-28 13:59:47 +02:00
parent eb4ba90ef8
commit 01587f02a2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/games/hedgewars/default.nix
View File

@ -1,27 +1,27 @@
{ SDL_image, SDL_ttf, SDL_net, fpc, qt4, ghcWithPackages, ffmpeg, freeglut { SDL_image, SDL_ttf, SDL_net, fpc, qt4, ghcWithPackages, ffmpeg, freeglut
, stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL, SDL_mixer , stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL, SDL_mixer
, zlib, libpng, mesa , zlib, libpng, mesa, physfs
}: }:
let let
ghc = ghcWithPackages (pkgs: with pkgs; [ 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 in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.9.20.5"; version = "0.9.21";
name = "hedgewars-${version}"; name = "hedgewars-${version}";
src = fetchurl { src = fetchurl {
url = "http://download.gna.org/hedgewars/hedgewars-src-${version}.tar.bz2"; url = "http://download.gna.org/hedgewars/hedgewars-src-${version}.tar.bz2";
sha256 = "1k5dq14s9pshrqlz8vnix237bcapfif4k3rc4yj4cmwdx1pqkl56"; sha256 = "0abnzpyq6sxlfcz5b0kh6r7n1692dwrgsdsr4s216xhh9n19xm0w";
}; };
buildInputs = [ buildInputs = [
SDL_ttf SDL_net cmake pkgconfig lua5_1 SDL SDL_mixer SDL_image fpc 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 = '' preBuild = ''
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL_image}/lib export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL_image}/lib
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
''; '';
postInstall = '' 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; { meta = with stdenv.lib; {