From f8743f3dcd90754ea2a6c6a9f5db3ad6f50bf602 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 May 2015 12:43:24 +0200 Subject: [PATCH] hedgewars: convert the build to Haskell NG --- pkgs/games/hedgewars/default.nix | 16 ++++++++++------ pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 3768375d6259..042d4f9fd4aa 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -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 -, 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 { version = "0.9.20.5"; name = "hedgewars-${version}"; @@ -12,9 +17,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - SDL_ttf SDL_net network vector utf8String bytestringShow hslogger random - cmake pkgconfig lua5_1 SDL SDL_mixer SDL_image fpc qt4 ghc ffmpeg freeglut - dataenc makeWrapper + SDL_ttf SDL_net cmake pkgconfig lua5_1 SDL SDL_mixer SDL_image fpc + qt4 ghc ffmpeg freeglut makeWrapper ]; 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 all movement on the battlefield has ceased).''; maintainers = maintainers.kragniz; - platforms = platforms.all; + platforms = ghc.meta.platforms; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cdc9dd0bc21..47c444b151f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12915,8 +12915,7 @@ let gtypist = callPackage ../games/gtypist { }; hedgewars = callPackage ../games/hedgewars { - inherit (haskellPackages) ghc network vector utf8String bytestringShow - random hslogger dataenc; + inherit (haskellPackages) ghcWithPackages; }; hexen = callPackage ../games/hexen { };