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

hedgewars: convert the build to Haskell NG

This commit is contained in:
Peter Simons 2015-05-04 12:43:24 +02:00
parent c34b6df8d8
commit f8743f3dcd
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,13 @@
{ SDL_image, SDL_ttf, SDL_net, fpc, qt4 , ghc, ffmpeg, freeglut, network, vector { 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
, utf8String, bytestringShow, hslogger, random, dataenc, zlib, libpng, mesa , zlib, libpng, mesa
}: }:
let
ghc = ghcWithPackages (pkgs: with pkgs; [
network vector utf8-string bytestring-show random hslogger dataenc
]);
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.9.20.5"; version = "0.9.20.5";
name = "hedgewars-${version}"; name = "hedgewars-${version}";
@ -12,9 +17,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
SDL_ttf SDL_net network vector utf8String bytestringShow hslogger random SDL_ttf SDL_net cmake pkgconfig lua5_1 SDL SDL_mixer SDL_image fpc
cmake pkgconfig lua5_1 SDL SDL_mixer SDL_image fpc qt4 ghc ffmpeg freeglut qt4 ghc ffmpeg freeglut makeWrapper
dataenc makeWrapper
]; ];
patches = [ ./fix-ghc-7.8-build-failure.diff ]; patches = [ ./fix-ghc-7.8-build-failure.diff ];
@ -64,6 +68,6 @@ stdenv.mkDerivation rec {
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 = maintainers.kragniz; maintainers = maintainers.kragniz;
platforms = platforms.all; platforms = ghc.meta.platforms;
}; };
} }

3
pkgs/top-level/all-packages.nix
View File

@ -12915,8 +12915,7 @@ let
gtypist = callPackage ../games/gtypist { }; gtypist = callPackage ../games/gtypist { };
hedgewars = callPackage ../games/hedgewars { hedgewars = callPackage ../games/hedgewars {
inherit (haskellPackages) ghc network vector utf8String bytestringShow inherit (haskellPackages) ghcWithPackages;
random hslogger dataenc;
}; };
hexen = callPackage ../games/hexen { }; hexen = callPackage ../games/hexen { };