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 78% rename from pkgs/development/libraries/liquid-dsp/default.nix rename to pkgs/by-name/li/liquid-dsp/package.nix index 6b4ce1c17233..55e7f60d85df 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/by-name/li/liquid-dsp/package.nix @@ -3,8 +3,7 @@ stdenv, cmake, fetchFromGitHub, - autoreconfHook, - autoSignDarwinBinariesHook, + darwin, fixDarwinDylibNames, }: @@ -19,23 +18,27 @@ 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 = [ cmake ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - autoSignDarwinBinariesHook + darwin.autoSignDarwinBinariesHook 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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a04ca2e8c1b4..2946c515f9b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6215,10 +6215,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; };