From 0b4a36dca180335d32944ee8ca3cbed7b262135e Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 16 Apr 2025 19:17:19 -0400 Subject: [PATCH] poco: propagate utf8proc The Poco Foundation CMake config file unconditionally searches for utf8proc. Therefore, every package that uses this CMake config requires utf8proc. Remove all utf8proc dependencies that were manually added because utf8proc was not propagated. --- pkgs/applications/networking/mumble/default.nix | 2 -- pkgs/applications/radio/pothos/default.nix | 2 -- pkgs/by-name/mu/multipass/multipassd.nix | 2 -- pkgs/by-name/po/poco/package.nix | 4 ++-- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 3205630ce61c..43f91c227027 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -13,7 +13,6 @@ protobuf, speex, libcap, - utf8proc, alsa-lib, python3, rnnoise, @@ -100,7 +99,6 @@ let qt5.qtsvg rnnoise speex - utf8proc ] ++ lib.optional (!jackSupport) alsa-lib ++ lib.optional jackSupport libjack2 diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix index afa1fcf14bc8..cf9b3be83409 100644 --- a/pkgs/applications/radio/pothos/default.nix +++ b/pkgs/applications/radio/pothos/default.nix @@ -18,7 +18,6 @@ alsa-lib, muparserx, python3, - utf8proc, }: mkDerivation rec { @@ -69,7 +68,6 @@ mkDerivation rec { alsa-lib muparserx python3 - utf8proc ]; postInstall = '' diff --git a/pkgs/by-name/mu/multipass/multipassd.nix b/pkgs/by-name/mu/multipass/multipassd.nix index e328ca783914..2cc6f9b6fb06 100644 --- a/pkgs/by-name/mu/multipass/multipassd.nix +++ b/pkgs/by-name/mu/multipass/multipassd.nix @@ -24,7 +24,6 @@ qt6, slang, stdenv, - utf8proc, xterm, }: @@ -121,7 +120,6 @@ stdenv.mkDerivation { protobuf qt6.qtbase qt6.qtwayland - utf8proc ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/poco/package.nix b/pkgs/by-name/po/poco/package.nix index e473a6ceae42..2117341d5232 100644 --- a/pkgs/by-name/po/poco/package.nix +++ b/pkgs/by-name/po/poco/package.nix @@ -7,11 +7,11 @@ pkg-config, zlib, pcre2, + utf8proc, expat, sqlite, openssl, unixODBC, - utf8proc, libmysqlclient, }: @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { buildInputs = [ unixODBC - utf8proc libmysqlclient ]; propagatedBuildInputs = [ zlib pcre2 + utf8proc expat sqlite openssl