From f08b7d8a73c614396e246d4d20ada1352918ea15 Mon Sep 17 00:00:00 2001 From: Ian Kilgore Date: Sun, 19 Jul 2026 10:38:12 -0400 Subject: [PATCH] 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;