tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

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.

J. T. Elscott 615baa8d 513de13f

+17
unified split
+13
pkgs/kde/gear/kio-extras/add-nixos-man-db-config-path.patch
···
··· 1 + diff --git a/man/kio_man.cpp b/man/kio_man.cpp 2 + index a2fb6dbf5..cb6f373bc 100644 3 + --- a/man/kio_man.cpp 4 + +++ b/man/kio_man.cpp 5 + @@ -868,6 +868,8 @@ void MANProtocol::constructPath(QStringList &constr_path, QStringList constr_cat 6 + mc.setFileName("/etc/manpath.config"); // SuSE, Debian 7 + if (!mc.exists()) 8 + mc.setFileName("/etc/man.config"); // Mandrake 9 + + if (!mc.exists()) 10 + + mc.setFileName("/run/current-system/etc/man_db.conf"); // NixOS 11 + 12 + if (mc.open(QIODevice::ReadOnly)) { 13 + QTextStream is(&mc);
+4
pkgs/kde/gear/kio-extras/default.nix
··· 19 mkKdeDerivation { 20 pname = "kio-extras"; 21 22 extraNativeBuildInputs = [ 23 pkg-config 24 gperf
··· 19 mkKdeDerivation { 20 pname = "kio-extras"; 21 22 + patches = [ 23 + # An upstream merge request is pending for this https://invent.kde.org/network/kio-extras/-/merge_requests/422 24 + ./add-nixos-man-db-config-path.patch 25 + ]; 26 extraNativeBuildInputs = [ 27 pkg-config 28 gperf