suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge pull request #26460 from romildo/fix.nixos-artwork

Browse Source 
nixos-artwork: add more wallpapers
This commit is contained in:
Joachim F 2017-06-13 23:20:52 +01:00 committed by GitHub
commit 631ec734eb
6 changed files with 108 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -35,10 +35,10 @@ let
chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides 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 cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
[org.gnome.desktop.background] [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] [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} ${cfg.extraGSettingsOverrides}
EOF EOF

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

@ -111,7 +111,7 @@ in
background = mkOption { background = mkOption {
type = types.str; 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 = '' description = ''
The background image or color to use. The background image or color to use.
''; '';

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

@ -517,7 +517,7 @@ in
sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59"; sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
} }
# GRUB 1.97 doesn't support gzipped XPMs. # 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 { (mkIf cfg.enable {

2
nixos/tests/installer.nix
View File

@ -221,7 +221,7 @@ let
docbook5_xsl docbook5_xsl
unionfs-fuse unionfs-fuse
ntp ntp
nixos-artwork nixos-artwork.wallpapers.gnome-dark
perlPackages.XMLLibXML perlPackages.XMLLibXML
perlPackages.ListCompare perlPackages.ListCompare

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

@ -1,23 +1,5 @@
{ stdenv, fetchurl }: { callPackage }:
stdenv.mkDerivation { rec {
name = "nixos-artwork-2015-02-27"; wallpapers = callPackage ./wallpapers.nix { };
# Remember to check the default lightdm wallpaper when updating
GnomeDark = fetchurl {
url = https://raw.githubusercontent.com/NixOS/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png;
sha256 = "0c7sl9k4zdjwvdz3nhlm8i4qv4cjr0qagalaa1a438jigixx27l7";
};
unpackPhase = "true";
installPhase = ''
mkdir -p $out/share/artwork/gnome
ln -s $GnomeDark $out/share/artwork/gnome/Gnome_Dark.png
'';
meta = with stdenv.lib; {
homepage = https://github.com/NixOS/nixos-artwork;
platforms = platforms.all;
};
} }

100
pkgs/data/misc/nixos-artwork/wallpapers.nix Normal file
View File

@ -0,0 +1,100 @@
{ stdenv, fetchurl }:
let
mkNixBackground = { name, src, description } @ attrs:
stdenv.mkDerivation {
inherit name src;
unpackPhase = "true";
installPhase = ''
mkdir -p $out/share/artwork/gnome
ln -s $src $out/share/artwork/gnome/
'';
meta = with stdenv.lib; {
inherit description;
homepage = https://github.com/NixOS/nixos-artwork;
license = licenses.free;
platforms = platforms.all;
};
};
in
{
gnome-dark = mkNixBackground {
name = "gnome-dark-2015-02-27";
description = "Gnome Dark background for Nix";
src = fetchurl {
url = https://raw.githubusercontent.com/Nix/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png;
sha256 = "0c7sl9k4zdjwvdz3nhlm8i4qv4cjr0qagalaa1a438jigixx27l7";
};
};
mosaic-blue = mkNixBackground {
name = "mosaic-blue-2016-02-19";
description = "Mosaic blue background for Nix";
src = fetchurl {
url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-mosaic-blue.png;
sha256 = "1cbcssa8qi0giza0k240w5yy4yb2bhc1p1r7pw8qmziprcmwv5n5";
};
};
simple-blue = mkNixBackground {
name = "simple-blue-2016-02-19";
description = "Simple blue background for Nix";
src = fetchurl {
url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-blue.png;
sha256 = "1llr175m454aqixxwbp3kb5qml2hi1kn7ia6lm7829ny6y7xrnms";
};
};
simple-dark-gray = mkNixBackground {
name = "simple-dark-gray-2016-02-19";
description = "Simple dark gray background for Nix";
src = fetchurl {
url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-dark-gray.png;
sha256 = "1282cnqc5qynp0q9gdll7bgpw23yp5bhvaqpar59ibkh3iscg8i5";
};
};
simple-light-gray = mkNixBackground {
name = "simple-light-gray-2016-02-19";
description = "Simple light gray background for Nix";
src = fetchurl {
url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-light-gray.png;
sha256 = "0i6d0xv1nzrv7na9hjrgzl3jrwn81vnprnq2pxyznlxbjcgkjnk2";
};
};
simple-red = mkNixBackground {
name = "simple-red-2016-02-19";
description = "Simple red background for Nix";
src = fetchurl {
url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-red.png;
sha256 = "16drprsi3q8xbxx3bxp54yld04c4lq6jankw8ww1irg7z61a6wjs";
};
};
stripes-logo = mkNixBackground {
name = "stripes-logo-2016-02-19";
description = "Stripes logo background for Nix";
src = fetchurl {
url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes-logo.png;
sha256 = "0cqjkgp30428c1yy8s4418k4qz0ycr6fzcg4rdi41wkh5g1hzjnl";
};
};
stripes = mkNixBackground {
name = "stripes-2016-02-19";
description = "Stripes background for Nix";
src = fetchurl {
url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes.png;
sha256 = "116337wv81xfg0g0bsylzzq2b7nbj6hjyh795jfc9mvzarnalwd3";
};
};
}