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

hedgewars: build using GHC 9.4

Browse Source
This commit is contained in:
Naïm Favier 2024-03-29 23:20:49 +01:00
parent f3239b1422
commit 201e6de9c7
No known key found for this signature in database
GPG Key ID: 95AFCE8211908325
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 , lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer
, zlib, libpng, libGL, libGLU, physfs , zlib, libpng, libGL, libGLU, physfs
, qtbase, qttools, wrapQtAppsHook , qtbase, qttools, wrapQtAppsHook
@ -7,7 +7,7 @@
}: }:
let let
ghc = ghcWithPackages (pkgs: with pkgs; [ ghc = haskell.packages.ghc94.ghcWithPackages (pkgs: with pkgs; [
SHA bytestring entropy hslogger network pkgs.zlib random SHA bytestring entropy hslogger network pkgs.zlib random
regex-tdfa sandi utf8-string vector regex-tdfa sandi utf8-string vector
]); ]);

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

@ -37195,9 +37195,7 @@ with pkgs;
hase = callPackage ../games/hase { }; hase = callPackage ../games/hase { };
hedgewars = libsForQt5.callPackage ../games/hedgewars { hedgewars = libsForQt5.callPackage ../games/hedgewars { };
inherit (haskellPackages) ghcWithPackages;
};
hikounomizu = callPackage ../games/hikounomizu { }; hikounomizu = callPackage ../games/hikounomizu { };