Merge pull request #226114 from trofi/lzwolf-fix-for-SDL2_net

lzwolf: fix build on SDL2_net-2.2

authored by Sergei Trofimovich and committed by GitHub ae494824 83c76b92

+25 -8
+25 -8
pkgs/games/lzwolf/default.nix
··· 1 - { stdenv, lib, fetchFromBitbucket, p7zip, cmake 2 - , SDL2, bzip2, zlib, libjpeg 3 - , libsndfile, mpg123 4 - , SDL2_net, SDL2_mixer }: 1 + { stdenv 2 + , lib 3 + , fetchFromBitbucket 4 + , p7zip 5 + , cmake 6 + , SDL2 7 + , bzip2 8 + , zlib 9 + , libjpeg 10 + , libsndfile 11 + , mpg123 12 + , pkg-config 13 + , SDL2_net 14 + , SDL2_mixer 15 + }: 5 16 6 17 stdenv.mkDerivation rec { 7 18 pname = "lzwolf"; 8 19 # Fix-Me: Remember to remove SDL2_mixer pin (at top-level) on next lzwolf upgrade. 9 - version = "unstable-2022-01-04"; 20 + version = "unstable-2022-12-26"; 10 21 11 22 src = fetchFromBitbucket { 12 23 owner = "linuxwolf6"; 13 24 repo = "lzwolf"; 14 - rev = "6e470316382b87378966f441e233760ce0ff478c"; 15 - sha256 = "sha256-IbZleY2FPyW3ORIGO2YFXQyAf1l9nDthpJjEKTTsilM="; 25 + rev = "a24190604296e16941c601b57afe4350462fc659"; 26 + sha256 = "sha256-CtBdvk6LXb/ll92Fxig/M4t4QNj8dNFJYd8F99b47kQ="; 16 27 }; 17 28 18 - nativeBuildInputs = [ p7zip cmake ]; 29 + postPatch = '' 30 + # SDL2_net-2.2.0 changed CMake component name slightly. 31 + substituteInPlace src/CMakeLists.txt \ 32 + --replace 'SDL2::SDL2_net' 'SDL2_net::SDL2_net' 33 + ''; 34 + 35 + nativeBuildInputs = [ p7zip pkg-config cmake ]; 19 36 buildInputs = [ 20 37 SDL2 bzip2 zlib libjpeg SDL2_mixer SDL2_net libsndfile mpg123 21 38 ];