From 118f0c5fc0f083af784065913e73ffe851affe63 Mon Sep 17 00:00:00 2001 From: r4v3n6101 Date: Sat, 15 Feb 2025 04:06:01 +0300 Subject: [PATCH 1/4] zmusic: optional alsa-lib only for linux --- pkgs/by-name/zm/zmusic/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/zm/zmusic/package.nix b/pkgs/by-name/zm/zmusic/package.nix index 6c7c04f4a648..c9f1cf10187d 100644 --- a/pkgs/by-name/zm/zmusic/package.nix +++ b/pkgs/by-name/zm/zmusic/package.nix @@ -29,9 +29,7 @@ stdenv.mkDerivation rec { "dev" ]; - patches = [ - ./fluidsynth.patch - ]; + patches = [ ./fluidsynth.patch ]; postPatch = '' substituteInPlace source/mididevices/music_fluidsynth_mididevice.cpp \ @@ -46,12 +44,11 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsa-lib fluidsynth libsndfile mpg123 zlib - ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; meta = { description = "GZDoom's music system as a standalone library"; From 7e379d28dcd5c7ef04c80bb7d598b125af039f52 Mon Sep 17 00:00:00 2001 From: r4v3n6101 Date: Sat, 15 Feb 2025 04:46:18 +0300 Subject: [PATCH 2/4] gzdoom: add darwin builds support --- pkgs/by-name/gz/gzdoom/package.nix | 39 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/gz/gzdoom/package.nix b/pkgs/by-name/gz/gzdoom/package.nix index 17051d7692e6..e0f3fbd2a66e 100644 --- a/pkgs/by-name/gz/gzdoom/package.nix +++ b/pkgs/by-name/gz/gzdoom/package.nix @@ -8,16 +8,13 @@ SDL2, bzip2, cmake, - fluidsynth, game-music-emu, gtk3, imagemagick, libGL, libjpeg, - libsndfile, libvpx, libwebp, - mpg123, ninja, openal, pkg-config, @@ -40,35 +37,32 @@ stdenv.mkDerivation rec { patches = [ ./string_format.patch ]; - outputs = [ - "out" - "doc" - ]; + outputs = [ "out" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "doc" ]; nativeBuildInputs = [ cmake - copyDesktopItems imagemagick makeWrapper ninja pkg-config - ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ]; buildInputs = [ SDL2 + zlib bzip2 - fluidsynth - game-music-emu gtk3 + + # Graphics libGL libjpeg - libsndfile libvpx libwebp - mpg123 - openal vulkan-loader - zlib + + # Sound (ZMusic contain MIDI libs) + game-music-emu + openal zmusic ]; @@ -80,12 +74,14 @@ stdenv.mkDerivation rec { --replace-fail "" "${src.rev}" ''; + # Apple dropped GL support + # Shader's loading will throw an error while linking cmakeFlags = [ "-DDYN_GTK=OFF" "-DDYN_OPENAL=OFF" - ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DHAVE_GLES2=OFF" ]; - desktopItems = [ + desktopItems = lib.optionals stdenv.hostPlatform.isLinux [ (makeDesktopItem { name = "gzdoom"; exec = "gzdoom"; @@ -96,7 +92,12 @@ stdenv.mkDerivation rec { }) ]; - postInstall = '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out/Applications" + mv gzdoom.app "$out/Applications/" + ''; + + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mv $out/bin/gzdoom $out/share/games/doom/gzdoom makeWrapper $out/share/games/doom/gzdoom $out/bin/gzdoom \ --set LD_LIBRARY_PATH ${lib.makeLibraryPath [ vulkan-loader ]} @@ -117,7 +118,7 @@ stdenv.mkDerivation rec { ZDoom, adding an OpenGL renderer and powerful scripting capabilities. ''; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; + platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ azahi lassulus From dae82373e6a879e89b12c4863d54376f2984a740 Mon Sep 17 00:00:00 2001 From: r4v3n6101 Date: Sat, 15 Feb 2025 04:48:26 +0300 Subject: [PATCH 3/4] maintainers: add r4v3n6101 --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b02dee4fe9a9..90e1575b2440 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19200,6 +19200,13 @@ githubId = 20760527; name = "Madelyn"; }; + r4v3n6101 = { + name = "r4v3n6101"; + email = "raven6107@gmail.com"; + github = "r4v3n6101"; + githubId = 30029970; + keys = [ { fingerprint = "FA05 8A29 B45E 06C0 8FE9 4907 05D2 BE42 F3EC D7CC"; } ]; + }; raboof = { email = "arnout@bzzt.net"; matrix = "@raboof:matrix.org"; From f01992f743bb5ea7eb55300c23896821b16f385d Mon Sep 17 00:00:00 2001 From: r4v3n6101 Date: Sat, 15 Feb 2025 04:50:39 +0300 Subject: [PATCH 4/4] gzdoom: add r4v3n6101 as maintainer zmusic: add r4v3n6101 as maintainer --- pkgs/by-name/gz/gzdoom/package.nix | 1 + pkgs/by-name/zm/zmusic/package.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/by-name/gz/gzdoom/package.nix b/pkgs/by-name/gz/gzdoom/package.nix index e0f3fbd2a66e..0a71bda14202 100644 --- a/pkgs/by-name/gz/gzdoom/package.nix +++ b/pkgs/by-name/gz/gzdoom/package.nix @@ -123,6 +123,7 @@ stdenv.mkDerivation rec { azahi lassulus Gliczy + r4v3n6101 ]; }; } diff --git a/pkgs/by-name/zm/zmusic/package.nix b/pkgs/by-name/zm/zmusic/package.nix index c9f1cf10187d..e68cb3db7368 100644 --- a/pkgs/by-name/zm/zmusic/package.nix +++ b/pkgs/by-name/zm/zmusic/package.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { azahi lassulus Gliczy + r4v3n6101 ]; }; }