From f2d74e7e87f766052a0786ec34c4bad9da015a72 Mon Sep 17 00:00:00 2001 From: Ian Kilgore Date: Sun, 19 Jul 2026 00:11:08 -0400 Subject: [PATCH 1/2] liquid-dsp: move to by-name/ --- .../li}/liquid-dsp/fix-cmake-pc-paths.patch | 0 .../libraries => by-name/li}/liquid-dsp/include-stdarg.patch | 0 .../default.nix => by-name/li/liquid-dsp/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{development/libraries => by-name/li}/liquid-dsp/fix-cmake-pc-paths.patch (100%) rename pkgs/{development/libraries => by-name/li}/liquid-dsp/include-stdarg.patch (100%) rename pkgs/{development/libraries/liquid-dsp/default.nix => by-name/li/liquid-dsp/package.nix} (94%) diff --git a/pkgs/development/libraries/liquid-dsp/fix-cmake-pc-paths.patch b/pkgs/by-name/li/liquid-dsp/fix-cmake-pc-paths.patch similarity index 100% rename from pkgs/development/libraries/liquid-dsp/fix-cmake-pc-paths.patch rename to pkgs/by-name/li/liquid-dsp/fix-cmake-pc-paths.patch diff --git a/pkgs/development/libraries/liquid-dsp/include-stdarg.patch b/pkgs/by-name/li/liquid-dsp/include-stdarg.patch similarity index 100% rename from pkgs/development/libraries/liquid-dsp/include-stdarg.patch rename to pkgs/by-name/li/liquid-dsp/include-stdarg.patch diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/by-name/li/liquid-dsp/package.nix similarity index 94% rename from pkgs/development/libraries/liquid-dsp/default.nix rename to pkgs/by-name/li/liquid-dsp/package.nix index 6b4ce1c17233..55e1192680bc 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/by-name/li/liquid-dsp/package.nix @@ -4,7 +4,7 @@ cmake, fetchFromGitHub, autoreconfHook, - autoSignDarwinBinariesHook, + darwin, fixDarwinDylibNames, }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cmake ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - autoSignDarwinBinariesHook + darwin.autoSignDarwinBinariesHook fixDarwinDylibNames ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80118b0bb715..83fb4894fbab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6217,10 +6217,6 @@ with pkgs; libwpe-fdo = callPackage ../development/libraries/libwpe/fdo.nix { }; - liquid-dsp = callPackage ../development/libraries/liquid-dsp { - inherit (darwin) autoSignDarwinBinariesHook; - }; - luabind = callPackage ../development/libraries/luabind { lua = lua5_1; }; luabind_luajit = luabind.override { lua = luajit; }; From f08b7d8a73c614396e246d4d20ada1352918ea15 Mon Sep 17 00:00:00 2001 From: Ian Kilgore Date: Sun, 19 Jul 2026 10:38:12 -0400 Subject: [PATCH 2/2] liquid-dsp: tidy attribute ordering, remove unused arg, patch comments --- pkgs/by-name/li/liquid-dsp/package.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/li/liquid-dsp/package.nix b/pkgs/by-name/li/liquid-dsp/package.nix index 55e1192680bc..55e7f60d85df 100644 --- a/pkgs/by-name/li/liquid-dsp/package.nix +++ b/pkgs/by-name/li/liquid-dsp/package.nix @@ -3,7 +3,6 @@ stdenv, cmake, fetchFromGitHub, - autoreconfHook, darwin, fixDarwinDylibNames, }: @@ -19,10 +18,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-IvWtoXuuIvpJfY4cyRUsPHgax2/aytYShSdxEStiPYI="; }; - cmakeFlags = [ - # Prevent native cpu arch from leaking into binaries. - (lib.cmakeBool "ENABLE_SIMD" false) - (lib.cmakeBool "FIND_SIMD" false) + patches = [ + # Fix CMake absolute include/lib paths issue, see also + # - https://github.com/NixOS/nixpkgs/issues/144170 + # - https://github.com/jgaeddert/liquid-dsp/pull/450 + ./fix-cmake-pc-paths.patch + # liquid.h uses va_list; needs stdarg.h + ./include-stdarg.patch ]; nativeBuildInputs = [ @@ -33,9 +35,10 @@ stdenv.mkDerivation rec { fixDarwinDylibNames ]; - patches = [ - ./fix-cmake-pc-paths.patch - ./include-stdarg.patch + cmakeFlags = [ + # Prevent native cpu arch from leaking into binaries. + (lib.cmakeBool "ENABLE_SIMD" false) + (lib.cmakeBool "FIND_SIMD" false) ]; doCheck = true;