diff options
author | Joachim F <joachifm@users.noreply.github.com> | 2018-05-05 20:09:44 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-05 20:09:44 +0000 |
commit | 1be056ca30dffb5d904fbb34b9833a9d609bba8f (patch) | |
tree | fa94d0cdc5a77c3ffdfac30d984b264c91436f1e | |
parent | cc2880a7b6e59239102cb980fd1a592c2a453729 (diff) | |
parent | 43650115e34ea610e53f718d9e02de7222ac0ba2 (diff) | |
download | nixlib-1be056ca30dffb5d904fbb34b9833a9d609bba8f.tar nixlib-1be056ca30dffb5d904fbb34b9833a9d609bba8f.tar.gz nixlib-1be056ca30dffb5d904fbb34b9833a9d609bba8f.tar.bz2 nixlib-1be056ca30dffb5d904fbb34b9833a9d609bba8f.tar.lz nixlib-1be056ca30dffb5d904fbb34b9833a9d609bba8f.tar.xz nixlib-1be056ca30dffb5d904fbb34b9833a9d609bba8f.tar.zst nixlib-1be056ca30dffb5d904fbb34b9833a9d609bba8f.zip |
Merge pull request #40000 from JohnAZoidberg/docmodule-optional-fix
nixos/documentation: Correct use of lib.optional
-rw-r--r-- | nixos/modules/misc/documentation.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 2e426c017080..b482a5a67523 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -75,20 +75,20 @@ let cfg = config.documentation; in (mkIf cfg.man.enable { environment.systemPackages = [ pkgs.man-db ]; environment.pathsToLink = [ "/share/man" ]; - environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable [ "devman" ]; + environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman"; }) (mkIf cfg.info.enable { environment.systemPackages = [ pkgs.texinfoInteractive ]; environment.pathsToLink = [ "/share/info" ]; - environment.extraOutputsToInstall = [ "info" ] ++ optional cfg.dev.enable [ "devinfo" ]; + environment.extraOutputsToInstall = [ "info" ] ++ optional cfg.dev.enable "devinfo"; }) (mkIf cfg.doc.enable { # TODO(@oxij): put it here and remove from profiles? # environment.systemPackages = [ pkgs.w3m ]; # w3m-nox? environment.pathsToLink = [ "/share/doc" ]; - environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable [ "devdoc" ]; + environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable "devdoc"; }) ]); |