public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #55351 from timor/kio-extras-man-protocol

Browse Source 
kio-extras: enable man protocol
This commit is contained in:
Thomas Tuegel 2019-02-16 13:47:56 -06:00 committed by GitHub
commit 3c9e2820ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/misc/documentation.nix
View File

@ -156,6 +156,7 @@ in
environment.systemPackages = [ pkgs.man-db ]; environment.systemPackages = [ pkgs.man-db ];
environment.pathsToLink = [ "/share/man" ]; environment.pathsToLink = [ "/share/man" ];
environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman"; environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman";
environment.etc."man.conf".source = "${pkgs.man-db}/etc/man_db.conf";
}) })
(mkIf cfg.info.enable { (mkIf cfg.info.enable {

4
pkgs/applications/kde/kio-extras.nix
View File

@ -3,7 +3,7 @@
exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets, exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets,
kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml, kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml,
kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon, kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon,
qtsvg, samba, solid qtsvg, samba, solid, gperf
}: }:
mkDerivation { mkDerivation {
@ -16,7 +16,7 @@ mkDerivation {
buildInputs = [ buildInputs = [
exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons
kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support
kpty libmtp libssh openexr openslp phonon qtsvg samba solid kpty libmtp libssh openexr openslp phonon qtsvg samba solid gperf
]; ];
CXXFLAGS = [ "-I${ilmbase.dev}/include/OpenEXR" ]; CXXFLAGS = [ "-I${ilmbase.dev}/include/OpenEXR" ];
} }