From 615baa8d74c4dc707e8027eeafe57ffadddd9ebf Mon Sep 17 00:00:00 2001 From: "J. T. Elscott" <78996170+99jte@users.noreply.github.com> Date: Thu, 13 Mar 2025 10:18:11 -0700 Subject: [PATCH] kdePackages.kio-extras: add a manpage search path for nixos Add the path /run/current-system/etc/man_db.conf. With my previous commits in this PR, khelpcenter is able to search for manpages because it calls out to man-db, but it doesn't know where to find them when asked to display them. --- .../kio-extras/add-nixos-man-db-config-path.patch | 13 +++++++++++++ pkgs/kde/gear/kio-extras/default.nix | 4 ++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/kde/gear/kio-extras/add-nixos-man-db-config-path.patch diff --git a/pkgs/kde/gear/kio-extras/add-nixos-man-db-config-path.patch b/pkgs/kde/gear/kio-extras/add-nixos-man-db-config-path.patch new file mode 100644 index 000000000000..275e6121c17f --- /dev/null +++ b/pkgs/kde/gear/kio-extras/add-nixos-man-db-config-path.patch @@ -0,0 +1,13 @@ +diff --git a/man/kio_man.cpp b/man/kio_man.cpp +index a2fb6dbf5..cb6f373bc 100644 +--- a/man/kio_man.cpp ++++ b/man/kio_man.cpp +@@ -868,6 +868,8 @@ void MANProtocol::constructPath(QStringList &constr_path, QStringList constr_cat + mc.setFileName("/etc/manpath.config"); // SuSE, Debian + if (!mc.exists()) + mc.setFileName("/etc/man.config"); // Mandrake ++ if (!mc.exists()) ++ mc.setFileName("/run/current-system/etc/man_db.conf"); // NixOS + + if (mc.open(QIODevice::ReadOnly)) { + QTextStream is(&mc); diff --git a/pkgs/kde/gear/kio-extras/default.nix b/pkgs/kde/gear/kio-extras/default.nix index 2260feeac62c..5bcf4b605069 100644 --- a/pkgs/kde/gear/kio-extras/default.nix +++ b/pkgs/kde/gear/kio-extras/default.nix @@ -19,6 +19,10 @@ mkKdeDerivation { pname = "kio-extras"; + patches = [ + # An upstream merge request is pending for this https://invent.kde.org/network/kio-extras/-/merge_requests/422 + ./add-nixos-man-db-config-path.patch + ]; extraNativeBuildInputs = [ pkg-config gperf