diff options
author | Naïm Favier <n@monade.li> | 2024-03-29 23:20:49 +0100 |
---|---|---|
committer | Naïm Favier <n@monade.li> | 2024-03-29 23:20:49 +0100 |
commit | 201e6de9c789e8d72dd73f453aef222ad904e58c (patch) | |
tree | 364054723ecd177d6a2470305f6a31e2b9d2af8e /pkgs | |
parent | f3239b1422dbd728c06032f957ad9a4fc0502a03 (diff) |
hedgewars: build using GHC 9.4
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/games/hedgewars/default.nix | 4 | ||||
-rw-r--r-- | 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 763dc3f63a6cf..ed800f9afb064 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 4cb3e6467b546..af033ee87f4b2 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 { }; |