From d9e588686e16bc0a267f7ef9139d3322a91edf28 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 11 Nov 2025 09:22:00 +0100 Subject: [PATCH 1/5] soundtracker: fix libxml2 detection --- pkgs/by-name/so/soundtracker/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/soundtracker/package.nix b/pkgs/by-name/so/soundtracker/package.nix index 373dd28ddd9a..843eea8e9be5 100644 --- a/pkgs/by-name/so/soundtracker/package.nix +++ b/pkgs/by-name/so/soundtracker/package.nix @@ -27,7 +27,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-g96Z1SdFGMq7WFI6x+UtmAHPZF0C+tHUOjNhmK2ld8I="; }; - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = '' + substituteInPlace configure.ac \ + --replace-fail 'AM_PATH_XML2(2.6.0, [], AC_MSG_ERROR(Fatal error: Need libxml2 >= 2.6.0))' \ + 'PKG_CHECK_MODULES([XML], [libxml-2.0 >= 2.6.0])' \ + --replace-fail 'XML_CPPFLAGS' 'XML_CFLAGS' \ + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Darwin binutils don't support D option for ar # ALSA macros are missing on Darwin, causing error substituteInPlace configure.ac \ @@ -60,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { jack2 audiofile goocanvas - libxml2 + libxml2 # found by PKG_CHECK_MODULES libsndfile ] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib; From 9cad29cab5050dfa0b901af77ca8f4b5e4210fe8 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 11 Nov 2025 09:23:13 +0100 Subject: [PATCH 2/5] soundtracker: 1.0.5 -> 1.0.5.1 --- pkgs/by-name/so/soundtracker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/soundtracker/package.nix b/pkgs/by-name/so/soundtracker/package.nix index 843eea8e9be5..8462361e96b8 100644 --- a/pkgs/by-name/so/soundtracker/package.nix +++ b/pkgs/by-name/so/soundtracker/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "soundtracker"; - version = "1.0.5"; + version = "1.0.5.1"; src = fetchzip { # Past releases get moved to the "old releases" directory. @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { # Nonetheless, only the name of the file seems to affect which file is # downloaded, so this path should be fine both for old and current releases. url = "mirror://sourceforge/soundtracker/soundtracker-${finalAttrs.version}.tar.xz"; - hash = "sha256-g96Z1SdFGMq7WFI6x+UtmAHPZF0C+tHUOjNhmK2ld8I="; + hash = "sha256-pvBCPPu8jBq9CFbSlKewEI+3t092zmtq+pbNLeJWU/8="; }; postPatch = '' From 41b2a9af7cc1bdc5377fc0eeb86f48643f055887 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 11 Nov 2025 09:31:28 +0100 Subject: [PATCH 3/5] soundtracker: add pulse support --- pkgs/by-name/so/soundtracker/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/so/soundtracker/package.nix b/pkgs/by-name/so/soundtracker/package.nix index 8462361e96b8..3832f85b962c 100644 --- a/pkgs/by-name/so/soundtracker/package.nix +++ b/pkgs/by-name/so/soundtracker/package.nix @@ -12,6 +12,7 @@ goocanvas, # graphical envelope editing libxml2, libsndfile, + libpulseaudio, }: stdenv.mkDerivation (finalAttrs: { @@ -69,7 +70,10 @@ stdenv.mkDerivation (finalAttrs: { libxml2 # found by PKG_CHECK_MODULES libsndfile ] - ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib; + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib # found by AM_PATH_ALSA + libpulseaudio # found by PKG_CHECK_MODULES + ]; meta = with lib; { description = "Music tracking tool similar in design to the DOS program FastTracker and the Amiga legend ProTracker"; From f0a0f2a9fee10a20db5f4609f19b481c7f73e2e8 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 11 Nov 2025 09:32:13 +0100 Subject: [PATCH 4/5] soundtracker: strict deps --- pkgs/by-name/so/soundtracker/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/so/soundtracker/package.nix b/pkgs/by-name/so/soundtracker/package.nix index 3832f85b962c..95f2c644f31d 100644 --- a/pkgs/by-name/so/soundtracker/package.nix +++ b/pkgs/by-name/so/soundtracker/package.nix @@ -13,6 +13,7 @@ libxml2, libsndfile, libpulseaudio, + glib, }: stdenv.mkDerivation (finalAttrs: { @@ -56,14 +57,21 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + strictDeps = true; + nativeBuildInputs = [ pkg-config autoreconfHook + SDL # AM_PATH_SDL + glib # glib-genmarshal + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib # AM_PATH_ALSA ]; buildInputs = [ gtk2 - SDL + SDL # found by AM_PATH_SDL jack2 audiofile goocanvas From d0a81ec88869ea6026cfbf71debf9bc0ad03842b Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 11 Nov 2025 09:36:14 +0100 Subject: [PATCH 5/5] soundtracker: remove with lib --- pkgs/by-name/so/soundtracker/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/so/soundtracker/package.nix b/pkgs/by-name/so/soundtracker/package.nix index 95f2c644f31d..576e44b79ba6 100644 --- a/pkgs/by-name/so/soundtracker/package.nix +++ b/pkgs/by-name/so/soundtracker/package.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio # found by PKG_CHECK_MODULES ]; - meta = with lib; { + meta = { description = "Music tracking tool similar in design to the DOS program FastTracker and the Amiga legend ProTracker"; longDescription = '' SoundTracker is a pattern-oriented music editor (similar to the DOS @@ -94,9 +94,9 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "http://www.soundtracker.org/"; downloadPage = "https://sourceforge.net/projects/soundtracker/files/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; - hydraPlatforms = platforms.linux; # sdl-config times out on darwin + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; + hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin }; })