diff options
-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-- | pkgs/data/misc/nixos-artwork/default.nix | 24 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
4 files changed, 27 insertions, 8 deletions
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index f6de8c02b186..d05edabca621 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -104,7 +104,7 @@ in }; background = mkOption { - default = "${pkgs.nixos-artwork}/gnome/Gnome_Dark.png"; + default = "${pkgs.nixos-artwork}/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 22af11b484e9..0b6333ab573b 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -337,7 +337,7 @@ in sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59"; } # GRUB 1.97 doesn't support gzipped XPMs. - else "${pkgs.nixos-artwork}/gnome/Gnome_Dark.png"); + else "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png"); } (mkIf cfg.enable { diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/pkgs/data/misc/nixos-artwork/default.nix new file mode 100644 index 000000000000..99f3e8b1177b --- /dev/null +++ b/pkgs/data/misc/nixos-artwork/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "nixos-artwork-2015-02-27"; + # Remember to check the default lightdm wallpaper when updating + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nixos-artwork"; + rev = "e71b6846023919136795ede22b16d73b2cf1693d"; + sha256 = "167yvhm2qy7qgyrqqs4hv98mmlarhgxpcsyv0r8a9g3vkblfdczb"; + }; + + installPhase = '' + mkdir -p $out/share/artwork + cp -r * $out/share/artwork + find $out -name \*.xcf -exec rm {} \; + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/NixOS/nixos-artwork"; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7a08a428982..4a20518363ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14422,12 +14422,7 @@ let nix-serve = callPackage ../tools/package-management/nix-serve { }; - # Remember to check the default lightdm wallpaper - nixos-artwork = fetchgit { - url = "git://github.com/NixOS/nixos-artwork"; - rev = "e71b6846023919136795ede22b16d73b2cf1693d"; - sha256 = "167yvhm2qy7qgyrqqs4hv98mmlarhgxpcsyv0r8a9g3vkblfdczb"; - }; + nixos-artwork = callPackage ../data/misc/nixos-artwork { }; nut = callPackage ../applications/misc/nut { }; |