From 201e6de9c789e8d72dd73f453aef222ad904e58c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Fri, 29 Mar 2024 23:20:49 +0100 Subject: [PATCH] hedgewars: build using GHC 9.4 --- pkgs/games/hedgewars/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 763dc3f63a6c..ed800f9afb06 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,4 +1,4 @@ -{ stdenv, SDL2_image_2_6, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg_4, freeglut +{ stdenv, SDL2_image_2_6, SDL2_ttf, SDL2_net, fpc, haskell, ffmpeg_4, freeglut , lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGL, libGLU, physfs , qtbase, qttools, wrapQtAppsHook @@ -7,7 +7,7 @@ }: let - ghc = ghcWithPackages (pkgs: with pkgs; [ + ghc = haskell.packages.ghc94.ghcWithPackages (pkgs: with pkgs; [ SHA bytestring entropy hslogger network pkgs.zlib random regex-tdfa sandi utf8-string vector ]); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cb3e6467b54..af033ee87f4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37195,9 +37195,7 @@ with pkgs; hase = callPackage ../games/hase { }; - hedgewars = libsForQt5.callPackage ../games/hedgewars { - inherit (haskellPackages) ghcWithPackages; - }; + hedgewars = libsForQt5.callPackage ../games/hedgewars { }; hikounomizu = callPackage ../games/hikounomizu { };