Merge pull request #302563 from pshirshov/patch-2

fheroes2: set platforms.unix instead of platforms.linux
This commit is contained in:
Weijia Wang 2024-04-09 09:17:43 +02:00 committed by GitHub
commit 551a976071
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,5 +1,6 @@
{ stdenv, lib, fetchFromGitHub, imagemagick { stdenv, lib, fetchFromGitHub, imagemagick
, gettext, glibcLocalesUtf8, libpng, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, zlib , gettext, glibcLocalesUtf8, libpng, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, zlib
, libiconv
, gitUpdater , gitUpdater
}: }:
@ -17,7 +18,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ imagemagick ]; nativeBuildInputs = [ imagemagick ];
buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]
++ lib.optionals stdenv.isDarwin [ libiconv ];
makeFlags = [ makeFlags = [
"FHEROES2_STRICT_COMPILATION=1" "FHEROES2_STRICT_COMPILATION=1"
@ -67,6 +69,6 @@ stdenv.mkDerivation rec {
''; '';
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = [ maintainers.karolchmist ]; maintainers = [ maintainers.karolchmist ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }