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

Merge pull request #40000 from JohnAZoidberg/docmodule-optional-fix

Browse Source 
nixos/documentation: Correct use of lib.optional
This commit is contained in:
Joachim F 2018-05-05 20:09:44 +00:00 committed by GitHub
commit 1be056ca30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,20 +75,20 @@ let cfg = config.documentation; in
(mkIf cfg.man.enable { (mkIf cfg.man.enable {
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";
}) })
(mkIf cfg.info.enable { (mkIf cfg.info.enable {
environment.systemPackages = [ pkgs.texinfoInteractive ]; environment.systemPackages = [ pkgs.texinfoInteractive ];
environment.pathsToLink = [ "/share/info" ]; environment.pathsToLink = [ "/share/info" ];
environment.extraOutputsToInstall = [ "info" ] ++ optional cfg.dev.enable [ "devinfo" ]; environment.extraOutputsToInstall = [ "info" ] ++ optional cfg.dev.enable "devinfo";
}) })
(mkIf cfg.doc.enable { (mkIf cfg.doc.enable {
# TODO(@oxij): put it here and remove from profiles? # TODO(@oxij): put it here and remove from profiles?
# environment.systemPackages = [ pkgs.w3m ]; # w3m-nox? # environment.systemPackages = [ pkgs.w3m ]; # w3m-nox?
environment.pathsToLink = [ "/share/doc" ]; environment.pathsToLink = [ "/share/doc" ];
environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable [ "devdoc" ]; environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable "devdoc";
}) })
]); ]);