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

Merge pull request #132691 from NixOS/backport-131305-to-release-21.05 

[Backport release-21.05] nixos-icons: fix icons not installed when documentation disabled
This commit is contained in:
davidak 2021-08-04 21:51:21 +02:00 committed by GitHub
parent 0c98790627 3f0926f6b5
commit 4e241b6e3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -651,6 +651,7 @@ in
pkgs.xterm pkgs.xterm
pkgs.xdg-utils pkgs.xdg-utils
xorg.xf86inputevdev.out # get evdev.4 man page 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; ++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh;