From f8db1570a83ce85b91dca3007caaea6aa98b0dd1 Mon Sep 17 00:00:00 2001 From: Lord-Valen Date: Sun, 7 Dec 2025 14:01:26 -0500 Subject: [PATCH 1/5] zita-convolver: update license --- pkgs/by-name/zi/zita-convolver/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/zi/zita-convolver/package.nix b/pkgs/by-name/zi/zita-convolver/package.nix index 6320c11050b8..1ccdbb93220d 100644 --- a/pkgs/by-name/zi/zita-convolver/package.nix +++ b/pkgs/by-name/zi/zita-convolver/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Convolution library by Fons Adriaensen"; version = version; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; }; From a218372c38265fc6adaa0073969d287dd25626ca Mon Sep 17 00:00:00 2001 From: Lord-Valen Date: Sun, 7 Dec 2025 14:01:39 -0500 Subject: [PATCH 2/5] zita-convolver: update homepage --- pkgs/by-name/zi/zita-convolver/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/zi/zita-convolver/package.nix b/pkgs/by-name/zi/zita-convolver/package.nix index 1ccdbb93220d..7d5d07bf3a5f 100644 --- a/pkgs/by-name/zi/zita-convolver/package.nix +++ b/pkgs/by-name/zi/zita-convolver/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Convolution library by Fons Adriaensen"; version = version; - homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; + homepage = "https://kokkinizita.linuxaudio.org/linuxaudio/index.html"; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; From 64b2192a40b0fa447df61f1d56961a8759c654a9 Mon Sep 17 00:00:00 2001 From: Lord-Valen Date: Sun, 7 Dec 2025 14:03:36 -0500 Subject: [PATCH 3/5] zita-convolver: remove superfluous metadata --- pkgs/by-name/zi/zita-convolver/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/zi/zita-convolver/package.nix b/pkgs/by-name/zi/zita-convolver/package.nix index 7d5d07bf3a5f..5a2d0f923e90 100644 --- a/pkgs/by-name/zi/zita-convolver/package.nix +++ b/pkgs/by-name/zi/zita-convolver/package.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { meta = { description = "Convolution library by Fons Adriaensen"; - version = version; homepage = "https://kokkinizita.linuxaudio.org/linuxaudio/index.html"; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.magnetophon ]; From b4f93c9e155cff33e39e7a1705518e0e94ecdbcc Mon Sep 17 00:00:00 2001 From: Lord-Valen Date: Sun, 7 Dec 2025 14:01:48 -0500 Subject: [PATCH 4/5] zita-convolver: use fetchzip --- pkgs/by-name/zi/zita-convolver/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/zi/zita-convolver/package.nix b/pkgs/by-name/zi/zita-convolver/package.nix index 5a2d0f923e90..8fb6faabfa63 100644 --- a/pkgs/by-name/zi/zita-convolver/package.nix +++ b/pkgs/by-name/zi/zita-convolver/package.nix @@ -1,16 +1,17 @@ { lib, stdenv, - fetchurl, + fetchzip, fftwFloat, }: stdenv.mkDerivation rec { pname = "zita-convolver"; version = "4.0.3"; - src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "0prji66p86z2bzminywkwchr5bfgxcg2i8y803pydd1hzf2198cs"; + + src = fetchzip { + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-convolver-4.0.3.tar.bz2"; + hash = "sha256-f8a3sLcN6GMPV/8E/faqMYkJdUa7WqmQBrehH6kCJtc="; }; buildInputs = [ fftwFloat ]; From 7554837c8246cf92d731d858d0c852390b47aa52 Mon Sep 17 00:00:00 2001 From: Lord-Valen Date: Sun, 7 Dec 2025 14:07:31 -0500 Subject: [PATCH 5/5] zita-convolver: use sourceRoot --- pkgs/by-name/zi/zita-convolver/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/zi/zita-convolver/package.nix b/pkgs/by-name/zi/zita-convolver/package.nix index 8fb6faabfa63..6d820aa5038f 100644 --- a/pkgs/by-name/zi/zita-convolver/package.nix +++ b/pkgs/by-name/zi/zita-convolver/package.nix @@ -5,7 +5,7 @@ fftwFloat, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zita-convolver"; version = "4.0.3"; @@ -14,10 +14,11 @@ stdenv.mkDerivation rec { hash = "sha256-f8a3sLcN6GMPV/8E/faqMYkJdUa7WqmQBrehH6kCJtc="; }; + sourceRoot = "${finalAttrs.src.name}/source"; + buildInputs = [ fftwFloat ]; patchPhase = '' - cd source sed -e "s@ldconfig@@" -i Makefile ''; @@ -28,7 +29,9 @@ stdenv.mkDerivation rec { postInstall = '' # create lib link for building apps - ln -s $out/lib/libzita-convolver.so.${version} $out/lib/libzita-convolver.so.${lib.versions.major version} + ln -s \ + $out/lib/libzita-convolver.so.${finalAttrs.version} \ + $out/lib/libzita-convolver.so.${lib.versions.major finalAttrs.version} ''; meta = { @@ -38,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; }; -} +})