diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-06 19:20:18 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-06 19:34:18 +0200 |
commit | 72d164c40da88078bdf9c788bcd1dd173ab5dcff (patch) | |
tree | 63b8f2b80a0f14916ad0293918c7c1066bff9491 /pkgs | |
parent | d764e55a1cabb56a5b79388a5f577a7c6051812e (diff) | |
download | nixlib-72d164c40da88078bdf9c788bcd1dd173ab5dcff.tar nixlib-72d164c40da88078bdf9c788bcd1dd173ab5dcff.tar.gz nixlib-72d164c40da88078bdf9c788bcd1dd173ab5dcff.tar.bz2 nixlib-72d164c40da88078bdf9c788bcd1dd173ab5dcff.tar.lz nixlib-72d164c40da88078bdf9c788bcd1dd173ab5dcff.tar.xz nixlib-72d164c40da88078bdf9c788bcd1dd173ab5dcff.tar.zst nixlib-72d164c40da88078bdf9c788bcd1dd173ab5dcff.zip |
hedgewars: fix build
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/games/hedgewars/default.nix | 9 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 7d0f59a4e0d0..2486d1da4704 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -5,7 +5,8 @@ let 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 stdenv.mkDerivation rec { @@ -21,6 +22,10 @@ stdenv.mkDerivation rec { qt4 ghc ffmpeg freeglut makeWrapper physfs ]; + postPatch = '' + substituteInPlace gameServer/CMakeLists.txt --replace mask evaluate + ''; + preBuild = '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL_image}/lib -rpath ${SDL_mixer}/lib @@ -65,7 +70,7 @@ stdenv.mkDerivation rec { 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 all movement on the battlefield has ceased).''; - maintainers = with maintainers; [ kragniz ]; + maintainers = with maintainers; [ kragniz fpletz ]; platforms = ghc.meta.platforms; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe4c30fc15fb..cc720ccf253e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15669,6 +15669,7 @@ in hedgewars = callPackage ../games/hedgewars { inherit (haskellPackages) ghcWithPackages; + ffmpeg = ffmpeg_2; }; hexen = callPackage ../games/hexen { }; |