hedgewars: fix build

This commit is contained in:
Franz Pletz 2016-08-06 19:20:18 +02:00
parent d764e55a1c
commit 72d164c40d
2 changed files with 8 additions and 2 deletions

View File

@ -5,7 +5,8 @@
let let
ghc = ghcWithPackages (pkgs: with pkgs; [ ghc = ghcWithPackages (pkgs: with pkgs; [
network vector utf8-string bytestring-show random hslogger dataenc SHA entropy zlib_0_5_4_2 network vector utf8-string bytestring-show random hslogger
dataenc SHA entropy zlib_0_5_4_2
]); ]);
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -21,6 +22,10 @@ stdenv.mkDerivation rec {
qt4 ghc ffmpeg freeglut makeWrapper physfs qt4 ghc ffmpeg freeglut makeWrapper physfs
]; ];
postPatch = ''
substituteInPlace gameServer/CMakeLists.txt --replace mask evaluate
'';
preBuild = '' preBuild = ''
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL_image}/lib export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL_image}/lib
-rpath ${SDL_mixer}/lib -rpath ${SDL_mixer}/lib
@ -65,7 +70,7 @@ stdenv.mkDerivation rec {
contact with explosions, to zero (the damage dealt to the attacked contact with explosions, to zero (the damage dealt to the attacked
hedgehog or hedgehogs after a player's or CPU turn is shown only when hedgehog or hedgehogs after a player's or CPU turn is shown only when
all movement on the battlefield has ceased).''; all movement on the battlefield has ceased).'';
maintainers = with maintainers; [ kragniz ]; maintainers = with maintainers; [ kragniz fpletz ];
platforms = ghc.meta.platforms; platforms = ghc.meta.platforms;
}; };
} }

View File

@ -15669,6 +15669,7 @@ in
hedgewars = callPackage ../games/hedgewars { hedgewars = callPackage ../games/hedgewars {
inherit (haskellPackages) ghcWithPackages; inherit (haskellPackages) ghcWithPackages;
ffmpeg = ffmpeg_2;
}; };
hexen = callPackage ../games/hexen { }; hexen = callPackage ../games/hexen { };