From 6b8c12413fdfd1d814934ba572e8c56baef62305 Mon Sep 17 00:00:00 2001 From: Ian Kilgore Date: Fri, 3 Jul 2026 01:51:58 -0400 Subject: [PATCH 1/4] maintainers: add iank --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 30f8d61a2c70..649021b01248 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11486,6 +11486,13 @@ githubId = 72767437; name = "Ian Holloway"; }; + iank = { + email = "iank@iank.org"; + github = "iank"; + githubId = 109598; + name = "Ian Kilgore"; + keys = [ { fingerprint = "21F7 244E 095F 619E 8E3E 1EB4 9F3A 4AAB 4D90 D879"; } ]; + }; ianliu = { email = "ian.liu88@gmail.com"; github = "ianliu"; From 07f050dfb6833fbcbfbaa021c2ce684a102b1b06 Mon Sep 17 00:00:00 2001 From: Ian Kilgore Date: Fri, 3 Jul 2026 01:54:41 -0400 Subject: [PATCH 2/4] liquid-dsp: 1.6.0 -> 1.8.0 --- .../libraries/liquid-dsp/default.nix | 29 +++++++++---------- .../liquid-dsp/fix-cmake-pc-paths.patch | 29 +++++++++++++++++++ .../libraries/liquid-dsp/include-stdarg.patch | 12 ++++++++ 3 files changed, 55 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/libraries/liquid-dsp/fix-cmake-pc-paths.patch create mode 100644 pkgs/development/libraries/liquid-dsp/include-stdarg.patch diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index 583d44001d91..d3319c2af117 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -1,44 +1,43 @@ { lib, stdenv, + cmake, fetchFromGitHub, autoreconfHook, - cctools, autoSignDarwinBinariesHook, fixDarwinDylibNames, }: stdenv.mkDerivation rec { pname = "liquid-dsp"; - version = "1.6.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "jgaeddert"; repo = "liquid-dsp"; rev = "v${version}"; - sha256 = "sha256-3UKAwhYaYZ42+d+wiW/AB6x5TSOel8d++d3HeZqAg/8="; + sha256 = "sha256-IvWtoXuuIvpJfY4cyRUsPHgax2/aytYShSdxEStiPYI="; }; - configureFlags = - lib.optionals stdenv.hostPlatform.isDarwin [ - "LIBTOOL=${cctools}/bin/libtool" - ] - ++ [ - # Prevent native cpu arch from leaking into binaries. This might lead to - # poor performance, but having portable and working executables is more - # important. - (lib.enableFeature true "simdoverride") - ]; + cmakeFlags = [ + # Prevent native cpu arch from leaking into binaries. + (lib.cmakeBool "ENABLE_SIMD" false) + (lib.cmakeBool "FIND_SIMD" false) + ]; nativeBuildInputs = [ - autoreconfHook + cmake ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools autoSignDarwinBinariesHook fixDarwinDylibNames ]; + patches = [ + ./fix-cmake-pc-paths.patch + ./include-stdarg.patch + ]; + meta = { homepage = "https://liquidsdr.org/"; description = "Digital signal processing library for software-defined radios"; diff --git a/pkgs/development/libraries/liquid-dsp/fix-cmake-pc-paths.patch b/pkgs/development/libraries/liquid-dsp/fix-cmake-pc-paths.patch new file mode 100644 index 000000000000..ed4d01061dc3 --- /dev/null +++ b/pkgs/development/libraries/liquid-dsp/fix-cmake-pc-paths.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 07c123889..a6640515c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -564,6 +564,9 @@ if (fftw3f_FOUND) + string(APPEND LIQUID_PC_LIBS_PRIVATE " -lfftw3f") + endif() + ++cmake_path(APPEND libdir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_LIBDIR}") ++cmake_path(APPEND includedir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") ++ + configure_file( + cmake/liquid-dsp.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/liquid-dsp.pc +diff --git a/cmake/liquid-dsp.pc.in b/cmake/liquid-dsp.pc.in +index 93597a7e4..06de85dee 100644 +--- a/cmake/liquid-dsp.pc.in ++++ b/cmake/liquid-dsp.pc.in +@@ -2,8 +2,8 @@ + + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@libdir_for_pc_file@ ++includedir=@includedir_for_pc_file@ + + Name: liquid-dsp + Description: Software-defined radio digital signal processing library diff --git a/pkgs/development/libraries/liquid-dsp/include-stdarg.patch b/pkgs/development/libraries/liquid-dsp/include-stdarg.patch new file mode 100644 index 000000000000..3eb68b99e636 --- /dev/null +++ b/pkgs/development/libraries/liquid-dsp/include-stdarg.patch @@ -0,0 +1,12 @@ +diff --git a/include/liquid.h b/include/liquid.h +index 290778b50..52d898d07 100644 +--- a/include/liquid.h ++++ b/include/liquid.h +@@ -34,6 +34,7 @@ extern "C" { + #include + #include + #include ++#include + + // compile-time short file path: use __FILE_NAME__ if available (Clang 9+, GCC 12+) + #ifdef __FILE_NAME__ From 2785b3a3b9d2f4a927835367bb9b58578a751287 Mon Sep 17 00:00:00 2001 From: Ian Kilgore Date: Fri, 3 Jul 2026 02:24:04 -0400 Subject: [PATCH 3/4] liquid-dsp: add iank as maintainer --- pkgs/development/libraries/liquid-dsp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index d3319c2af117..c13ee64b5119 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { description = "Digital signal processing library for software-defined radios"; license = lib.licenses.mit; platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ iank ]; }; } From e386d14879aa642d21aa7c4059466ac57aab3b1d Mon Sep 17 00:00:00 2001 From: Ian Kilgore Date: Fri, 3 Jul 2026 02:40:22 -0400 Subject: [PATCH 4/4] liquid-dsp: run tests --- pkgs/development/libraries/liquid-dsp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index c13ee64b5119..6b4ce1c17233 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { ./include-stdarg.patch ]; + doCheck = true; + meta = { homepage = "https://liquidsdr.org/"; description = "Digital signal processing library for software-defined radios";