diff options
author | davidak <davidak@users.noreply.github.com> | 2021-08-04 21:35:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-04 21:35:45 +0200 |
commit | 872111e9d29c96c8116a5fbf81b2f2dd52b39c5b (patch) | |
tree | 5b0773e12be18d096d19a45f7808db5422d64201 /nixos/modules | |
parent | ab2e08fc659271b9560ffe9a6195dd1f60dab8c0 (diff) | |
parent | aa8373ab1b98b700c411eac1fe9e3d858a802909 (diff) | |
download | nixpkgs-872111e9d29c96c8116a5fbf81b2f2dd52b39c5b.tar nixpkgs-872111e9d29c96c8116a5fbf81b2f2dd52b39c5b.tar.gz nixpkgs-872111e9d29c96c8116a5fbf81b2f2dd52b39c5b.tar.bz2 nixpkgs-872111e9d29c96c8116a5fbf81b2f2dd52b39c5b.tar.lz nixpkgs-872111e9d29c96c8116a5fbf81b2f2dd52b39c5b.tar.xz nixpkgs-872111e9d29c96c8116a5fbf81b2f2dd52b39c5b.tar.zst nixpkgs-872111e9d29c96c8116a5fbf81b2f2dd52b39c5b.zip |
Merge pull request #131305 from davidak/nixos-icons-fix
nixos-icons: fix icons not installed when documentation disabled
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/misc/documentation.nix | 3 | ||||
-rw-r--r-- | nixos/modules/services/x11/xserver.nix | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index c88cc693061..7e04f0f16a9 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -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." diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 37e004ae80a..bb50aa1d35c 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -657,6 +657,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; |