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

Merge pull request #31961 from adisbladis/hedgewars-0_9_23 

hedgewars: 0.9.22 -> 0.9.23
This commit is contained in:
Pascal Wittmann 2017-11-23 09:42:32 +01:00 committed by GitHub
parent 1e5bdbb273 5f111a854e
commit 6b21d3acd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,25 +1,25 @@
{ SDL_image, SDL_ttf, SDL_net, fpc, qt4, ghcWithPackages, ffmpeg, freeglut { SDL2_image, SDL2_ttf, SDL2_net, fpc, qt4, ghcWithPackages, ffmpeg, freeglut
, stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL, SDL_mixer , stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer
, zlib, libpng, mesa, physfs , zlib, libpng, mesa, physfs
}: }:
let let
ghc = ghcWithPackages (pkgs: with pkgs; [ ghc = ghcWithPackages (pkgs: with pkgs; [
network vector utf8-string bytestring-show random hslogger network vector utf8-string bytestring-show random hslogger
dataenc SHA entropy pkgs.zlib SHA entropy pkgs.zlib sandi regex-tdfa
]); ]);
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.9.22"; version = "0.9.23";
name = "hedgewars-${version}"; name = "hedgewars-${version}";
src = fetchurl { src = fetchurl {
url = "http://download.gna.org/hedgewars/hedgewars-src-${version}.tar.bz2"; url = "http://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2";
sha256 = "14i1wvqbqib9h9092z10g4g0y14r5sp2fdaksvnw687l3ybwi6dn"; sha256 = "12df5ar3zk186ah51c3myr4hlzyybcshmf1w1wf6vr9b0h44jbns";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
SDL_ttf SDL_net cmake lua5_1 SDL SDL_mixer SDL_image fpc SDL2_ttf SDL2_net cmake lua5_1 SDL2 SDL2_mixer SDL2_image fpc
qt4 ghc ffmpeg freeglut makeWrapper physfs qt4 ghc ffmpeg freeglut makeWrapper physfs
]; ];
@ -28,11 +28,11 @@ stdenv.mkDerivation rec {
''; '';
preBuild = '' preBuild = ''
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL_image}/lib export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL2_image}/lib
-rpath ${SDL_mixer}/lib -rpath ${SDL2_mixer}/lib
-rpath ${SDL_net}/lib -rpath ${SDL2_net}/lib
-rpath ${SDL_ttf}/lib -rpath ${SDL2_ttf}/lib
-rpath ${SDL.out}/lib -rpath ${SDL2.out}/lib
-rpath ${libpng.out}/lib -rpath ${libpng.out}/lib
-rpath ${lua5_1}/lib -rpath ${lua5_1}/lib
-rpath ${mesa}/lib -rpath ${mesa}/lib