BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hedgewars: hold SDL2_image back on 2.6 branch

Browse source 
Without the holdback hedgewars fails to start game sessions on
`SDL2_image-2.8.1` as:

    "Surface2Tex failed, expecting 32 bit surface"

It is caused by lack of support of palette-based .png files by
`hedgewars`. Those were added in `SDL2_image-2.8` in

    bf0821bcc7
This commit is contained in:
Sergei Trofimovich 2023-12-14 22:33:08 +00:00
parent 309e6be7d4
commit 3e54fa949c
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/games/hedgewars/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg_4, freeglut { stdenv, SDL2_image_2_6, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, 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
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
buildInputs = [ buildInputs = [
SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image_2_6
fpc lua5_1 fpc lua5_1
llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64 llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64
ffmpeg_4 freeglut physfs ffmpeg_4 freeglut physfs
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = lib.concatMapStringsSep " " (e: "-rpath ${e}/lib") [ NIX_LDFLAGS = lib.concatMapStringsSep " " (e: "-rpath ${e}/lib") [
SDL2.out SDL2.out
SDL2_image SDL2_image_2_6
SDL2_mixer SDL2_mixer
SDL2_net SDL2_net
SDL2_ttf SDL2_ttf

6
pkgs/top-level/all-packages.nix
View file

@ -24925,6 +24925,12 @@ with pkgs;
version = "2.0.5"; version = "2.0.5";
hash = "sha256-vdX24CZoL31+G+C2BRsgnaL0AqLdi9HEvZwlrSYxCNA"; hash = "sha256-vdX24CZoL31+G+C2BRsgnaL0AqLdi9HEvZwlrSYxCNA";
}); });
SDL2_image_2_6 = SDL2_image.override({
# Pinned for hedgewars:
# https://github.com/NixOS/nixpkgs/pull/274185#issuecomment-1856764786
version = "2.6.3";
hash = "sha256-kxyb5b8dfI+um33BV4KLfu6HTiPH8ktEun7/a0g2MSw=";
});
SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { SDL2_mixer = callPackage ../development/libraries/SDL2_mixer {
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;