mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
hedgewars: build using GHC 9.4
This commit is contained in:
parent
f3239b1422
commit
201e6de9c7
|
@ -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
|
||||||
]);
|
]);
|
||||||
|
|
|
@ -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 { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue