mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity

nixos-artwork: Make into a derivation and use fetchfromgithub

Browse source
This commit is contained in:
William A. Kennington III 2015-06-08 18:32:32 -07:00
parent ddafa487fc
commit 48381b7621
4 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/x11/display-managers/lightdm.nix
View file

@ -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.
'';

2
nixos/modules/system/boot/loader/grub/grub.nix
View file

@ -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 {

24
pkgs/data/misc/nixos-artwork/default.nix Normal file
View file

@ -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;
};
}

7
pkgs/top-level/all-packages.nix
View file

@ -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 { };