commit aa8018103c75df14ff7e4f424c6b30f21df080cc · pyrox.dev/nixpkgs

+2 -2

nixos/modules/services/x11/desktop-managers/gnome3.nix

···

       35
       35
        
            chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides

     

       36
       36
        
            cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF

     

       37
       37
        
              [org.gnome.desktop.background]

     

       38
       38
       -
              picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png'

     

       38
       38
       +
              picture-uri='${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png'

     

       39
       39
        
       

     

       40
       40
        
              [org.gnome.desktop.screensaver]

     

       41
       41
       -
              picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png'

     

       41
       41
       +
              picture-uri='${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png'

     

       42
       42
        
       

     

       43
       43
        
              ${cfg.extraGSettingsOverrides}

     

       44
       44
        
            EOF

+1 -1

nixos/modules/services/x11/display-managers/lightdm.nix

···

       111
       111
        
       

     

       112
       112
        
             background = mkOption {

     

       113
       113
        
               type = types.str;

     

       114
       114
       -
               default = "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png";

     

       114
       114
       +
               default = "${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png";

     

       115
       115
        
               description = ''

     

       116
       116
        
                 The background image or color to use.

     

       117
       117
        
               '';

+1 -1

nixos/modules/system/boot/loader/grub/grub.nix

···

       489
       489
        
                 sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";

     

       490
       490
        
               }

     

       491
       491
        
               # GRUB 1.97 doesn't support gzipped XPMs.

     

       492
       492
       -
               else "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png");

     

       492
       492
       +
               else "${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png");

     

       493
       493
        
           }

     

       494
       494
        
       

     

       495
       495
        
           (mkIf cfg.enable {

+1 -1

nixos/tests/installer.nix

···

       221
       221
        
                       docbook5_xsl

     

       222
       222
        
                       unionfs-fuse

     

       223
       223
        
                       ntp

     

       224
       224
       -
                       nixos-artwork

     

       224
       224
       +
                       nixos-artwork.wallpapers.gnome-dark

     

       225
       225
        
                       perlPackages.XMLLibXML

     

       226
       226
        
                       perlPackages.ListCompare

     

       227
       227

+3 -21

pkgs/data/misc/nixos-artwork/default.nix

···

       1
       1
       -
       { stdenv, fetchurl }:

     

       2
       2
       -
       

     

       3
       3
       -
       stdenv.mkDerivation {

     

       4
       4
       -
         name = "nixos-artwork-2015-02-27";

     

       5
       5
       -
         # Remember to check the default lightdm wallpaper when updating

     

       6
       6
       -
       

     

       7
       7
       -
         GnomeDark = fetchurl {

     

       8
       8
       -
           url = https://raw.githubusercontent.com/NixOS/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png;

     

       9
       9
       -
           sha256 = "0c7sl9k4zdjwvdz3nhlm8i4qv4cjr0qagalaa1a438jigixx27l7";

     

       10
       10
       -
         };

     

       11
       11
       -
       

     

       12
       12
       -
         unpackPhase = "true";

     

       1
       1
       +
       { callPackage }:

     

       13
       2
        
       

     

       14
       14
       -
         installPhase = ''

     

       15
       15
       -
           mkdir -p $out/share/artwork/gnome

     

       16
       16
       -
           ln -s $GnomeDark $out/share/artwork/gnome/Gnome_Dark.png

     

       17
       17
       -
         '';

     

       18
       18
       -
         

     

       19
       19
       -
         meta = with stdenv.lib; {

     

       20
       20
       -
           homepage = https://github.com/NixOS/nixos-artwork;

     

       21
       21
       -
           platforms = platforms.all;

     

       22
       22
       -
         };

     

       3
       3
       +
       rec {

     

       4
       4
       +
         wallpapers = callPackage ./wallpapers.nix { };

     

       23
       5
        
       }

+100

pkgs/data/misc/nixos-artwork/wallpapers.nix

···

       1
       1
       +
       { stdenv, fetchurl }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         mkNixBackground = { name, src, description } @ attrs:

     

       5
       5
       +
       

     

       6
       6
       +
           stdenv.mkDerivation {

     

       7
       7
       +
             inherit name src;

     

       8
       8
       +
       

     

       9
       9
       +
             unpackPhase = "true";

     

       10
       10
       +
       

     

       11
       11
       +
             installPhase = ''

     

       12
       12
       +
               mkdir -p $out/share/artwork/gnome

     

       13
       13
       +
               ln -s $src $out/share/artwork/gnome/

     

       14
       14
       +
             '';

     

       15
       15
       +
       

     

       16
       16
       +
             meta = with stdenv.lib; {

     

       17
       17
       +
               inherit description;

     

       18
       18
       +
               homepage = https://github.com/NixOS/nixos-artwork;

     

       19
       19
       +
               license = licenses.free;

     

       20
       20
       +
               platforms = platforms.all;

     

       21
       21
       +
             };

     

       22
       22
       +
           };

     

       23
       23
       +
       

     

       24
       24
       +
       in

     

       25
       25
       +
       

     

       26
       26
       +
       {

     

       27
       27
       +
       

     

       28
       28
       +
         gnome-dark = mkNixBackground {

     

       29
       29
       +
           name = "gnome-dark-2015-02-27";

     

       30
       30
       +
           description = "Gnome Dark background for Nix";

     

       31
       31
       +
           src = fetchurl {

     

       32
       32
       +
             url = https://raw.githubusercontent.com/Nix/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png;

     

       33
       33
       +
             sha256 = "0c7sl9k4zdjwvdz3nhlm8i4qv4cjr0qagalaa1a438jigixx27l7";

     

       34
       34
       +
           };

     

       35
       35
       +
         };

     

       36
       36
       +
       

     

       37
       37
       +
         mosaic-blue = mkNixBackground {

     

       38
       38
       +
           name = "mosaic-blue-2016-02-19";

     

       39
       39
       +
           description = "Mosaic blue background for Nix";

     

       40
       40
       +
           src = fetchurl {

     

       41
       41
       +
             url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-mosaic-blue.png;

     

       42
       42
       +
             sha256 = "1cbcssa8qi0giza0k240w5yy4yb2bhc1p1r7pw8qmziprcmwv5n5";

     

       43
       43
       +
           };

     

       44
       44
       +
         };

     

       45
       45
       +
       

     

       46
       46
       +
         simple-blue = mkNixBackground {

     

       47
       47
       +
           name = "simple-blue-2016-02-19";

     

       48
       48
       +
           description = "Simple blue background for Nix";

     

       49
       49
       +
           src = fetchurl {

     

       50
       50
       +
             url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-blue.png;

     

       51
       51
       +
             sha256 = "1llr175m454aqixxwbp3kb5qml2hi1kn7ia6lm7829ny6y7xrnms";

     

       52
       52
       +
           };

     

       53
       53
       +
         };

     

       54
       54
       +
       

     

       55
       55
       +
         simple-dark-gray = mkNixBackground {

     

       56
       56
       +
           name = "simple-dark-gray-2016-02-19";

     

       57
       57
       +
           description = "Simple dark gray background for Nix";

     

       58
       58
       +
           src = fetchurl {

     

       59
       59
       +
             url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-dark-gray.png;

     

       60
       60
       +
             sha256 = "1282cnqc5qynp0q9gdll7bgpw23yp5bhvaqpar59ibkh3iscg8i5";

     

       61
       61
       +
           };

     

       62
       62
       +
         };

     

       63
       63
       +
       

     

       64
       64
       +
         simple-light-gray = mkNixBackground {

     

       65
       65
       +
           name = "simple-light-gray-2016-02-19";

     

       66
       66
       +
           description = "Simple light gray background for Nix";

     

       67
       67
       +
           src = fetchurl {

     

       68
       68
       +
             url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-light-gray.png;

     

       69
       69
       +
             sha256 = "0i6d0xv1nzrv7na9hjrgzl3jrwn81vnprnq2pxyznlxbjcgkjnk2";

     

       70
       70
       +
           };

     

       71
       71
       +
         };

     

       72
       72
       +
       

     

       73
       73
       +
         simple-red = mkNixBackground {

     

       74
       74
       +
           name = "simple-red-2016-02-19";

     

       75
       75
       +
           description = "Simple red background for Nix";

     

       76
       76
       +
           src = fetchurl {

     

       77
       77
       +
             url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-red.png;

     

       78
       78
       +
             sha256 = "16drprsi3q8xbxx3bxp54yld04c4lq6jankw8ww1irg7z61a6wjs";

     

       79
       79
       +
           };

     

       80
       80
       +
         };

     

       81
       81
       +
       

     

       82
       82
       +
         stripes-logo = mkNixBackground {

     

       83
       83
       +
           name = "stripes-logo-2016-02-19";

     

       84
       84
       +
           description = "Stripes logo background for Nix";

     

       85
       85
       +
           src = fetchurl {

     

       86
       86
       +
             url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes-logo.png;

     

       87
       87
       +
             sha256 = "0cqjkgp30428c1yy8s4418k4qz0ycr6fzcg4rdi41wkh5g1hzjnl";

     

       88
       88
       +
           };

     

       89
       89
       +
         };

     

       90
       90
       +
       

     

       91
       91
       +
         stripes = mkNixBackground {

     

       92
       92
       +
           name = "stripes-2016-02-19";

     

       93
       93
       +
           description = "Stripes background for Nix";

     

       94
       94
       +
           src = fetchurl {

     

       95
       95
       +
             url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes.png;

     

       96
       96
       +
             sha256 = "116337wv81xfg0g0bsylzzq2b7nbj6hjyh795jfc9mvzarnalwd3";

     

       97
       97
       +
           };

     

       98
       98
       +
         };

     

       99
       99
       +
       

     

       100
       100
       +
       }