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

nixos-icons: fix icons not installed when documentation disabled

Browse Source 
(cherry picked from commit aa8373ab1b98b700c411eac1fe9e3d858a802909)
This commit is contained in:
davidak 2021-07-24 06:50:01 +02:00 committed by github-actions[bot]
parent b1ee3bc424
commit 3f0926f6b5
2 changed files with 2 additions and 2 deletions
nixos/modules
misc
documentation.nix
services/x11
xserver.nix

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

@ -258,8 +258,7 @@ in
environment.systemPackages = []
++ optional cfg.man.enable manual.manpages
++ optionals cfg.doc.enable ([ manual.manualHTML nixos-help ]
++ optionals config.services.xserver.enable [ pkgs.nixos-icons ]);
++ optionals cfg.doc.enable [ manual.manualHTML nixos-help ];
services.getty.helpLine = mkIf cfg.doc.enable (
"\nRun 'nixos-help' for the NixOS manual."

1
nixos/modules/services/x11/xserver.nix
View File

@ -651,6 +651,7 @@ in
pkgs.xterm
pkgs.xdg-utils
xorg.xf86inputevdev.out # get evdev.4 man page
pkgs.nixos-icons # needed for gnome and pantheon about dialog, nixos-manual and maybe more
]
++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh;