From 050590ec5c3988ce25f6bafcfd1829464e2ad176 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 5 Apr 2025 08:22:57 +0200 Subject: [PATCH 1/3] libjack2: remove unused eigen dependency The eigen dependency was added in 9d0441434db401bf5fbfb0b8681e17ce7a04f3cb to support the iio plugin. This plugin however was never included in our libjack. Reason is, upstream requires both eigen and gtkIOStream for iio [1]. gtkIOstream [2] is mostly unmaintained upstream and not even packaged in nixpkgs. This means the eigen dependency is currently effectively unused. [1] https://github.com/jackaudio/jack2/blob/43e1173e3060b2ebc9b6c54058464d5145afbf6e/wscript#L140-L149 [2] https://github.com/flatmax/gtkiostream --- pkgs/misc/jackaudio/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 78e32544b1a3..dbf04975730b 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -9,7 +9,6 @@ libsamplerate, libsndfile, readline, - eigen, celt, wafHook, # Darwin Dependencies @@ -73,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: { libsamplerate libsndfile readline - eigen celt optDbus optPythonDBus From 9e12b821407ac46d18ba79db6c7364f74e875e56 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 5 Apr 2025 08:28:06 +0200 Subject: [PATCH 2/3] libjack2: remove unused readline and libsndfile dependencies These dependencies were used in example tools and projects. The example tools and projects were never built in nix, and were removed in the upstream 1.9.22 release [1]. This makes `readline` and `libsndfile` unused dependencies that should be cleaned up. [1] https://github.com/jackaudio/jack2/releases/tag/v1.9.22 --- pkgs/misc/jackaudio/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index dbf04975730b..33b799cf45ec 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -7,8 +7,6 @@ python3Packages, makeWrapper, libsamplerate, - libsndfile, - readline, celt, wafHook, # Darwin Dependencies @@ -70,8 +68,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libsamplerate - libsndfile - readline celt optDbus optPythonDBus From 5e472892ca276f2e57b9c1be01c689e8795b6729 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 5 Apr 2025 08:32:53 +0200 Subject: [PATCH 3/3] libjack2: refactor --- pkgs/misc/jackaudio/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 33b799cf45ec..ec5886504edb 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -125,17 +125,17 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' substituteInPlace "$dev/lib/pkgconfig/jack.pc" \ - --replace "$out/include" "$dev/include" + --replace-fail "$out/include" "$dev/include" ''; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = with lib; { + meta = { description = "JACK audio connection kit, version 2 with jackdbus"; homepage = "https://jackaudio.org"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; pkgConfigModules = [ "jack" ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; maintainers = [ ]; }; })