diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2017-06-13 23:20:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-13 23:20:52 +0100 |
| commit | 631ec734eb74bfdd267fda595929492bd34cfcc2 (patch) | |
| tree | abf1979e393b3bde357fb3eac2d0c9ff4a83b9c4 /nixos | |
| parent | 2444eab485ed6631fea02577b0d21c808405fd5e (diff) | |
| parent | aa8018103c75df14ff7e4f424c6b30f21df080cc (diff) | |
| download | nixlib-631ec734eb74bfdd267fda595929492bd34cfcc2.tar nixlib-631ec734eb74bfdd267fda595929492bd34cfcc2.tar.gz nixlib-631ec734eb74bfdd267fda595929492bd34cfcc2.tar.bz2 nixlib-631ec734eb74bfdd267fda595929492bd34cfcc2.tar.lz nixlib-631ec734eb74bfdd267fda595929492bd34cfcc2.tar.xz nixlib-631ec734eb74bfdd267fda595929492bd34cfcc2.tar.zst nixlib-631ec734eb74bfdd267fda595929492bd34cfcc2.zip | |
Merge pull request #26460 from romildo/fix.nixos-artwork
nixos-artwork: add more wallpapers
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/x11/display-managers/lightdm.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/grub.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/installer.nix | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 5f99c2bcf1f1..c043884f8e0b 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -35,10 +35,10 @@ let chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF [org.gnome.desktop.background] - picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png' + picture-uri='${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png' [org.gnome.desktop.screensaver] - picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png' + picture-uri='${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png' ${cfg.extraGSettingsOverrides} EOF diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 256bfb9ce3f4..1733f2fd39b2 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -111,7 +111,7 @@ in background = mkOption { type = types.str; - default = "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png"; + default = "${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png"; description = '' The background image or color to use. ''; diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 1681439a7287..9056121fa7d1 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -517,7 +517,7 @@ in sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59"; } # GRUB 1.97 doesn't support gzipped XPMs. - else "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png"); + else "${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png"); } (mkIf cfg.enable { diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 6dce6f407cda..85d31334d6bf 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -221,7 +221,7 @@ let docbook5_xsl unionfs-fuse ntp - nixos-artwork + nixos-artwork.wallpapers.gnome-dark perlPackages.XMLLibXML perlPackages.ListCompare |