diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-08-25 14:57:11 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-08-25 14:57:11 +0200 |
| commit | 985d1ac425735963d396e1c09dd49ad111813649 (patch) | |
| tree | 38a90f65d3bf5906ef020ef2c9482565325e850e /pkgs/desktops/pantheon | |
| parent | bc238b8df55bad9d8a436e120615cc5cfbbb78dc (diff) | |
| parent | f188bad6eaf26ebee19d02df03b1c6ae56c4d7f6 (diff) | |
| download | nixlib-985d1ac425735963d396e1c09dd49ad111813649.tar nixlib-985d1ac425735963d396e1c09dd49ad111813649.tar.gz nixlib-985d1ac425735963d396e1c09dd49ad111813649.tar.bz2 nixlib-985d1ac425735963d396e1c09dd49ad111813649.tar.lz nixlib-985d1ac425735963d396e1c09dd49ad111813649.tar.xz nixlib-985d1ac425735963d396e1c09dd49ad111813649.tar.zst nixlib-985d1ac425735963d396e1c09dd49ad111813649.zip | |
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611
Diffstat (limited to 'pkgs/desktops/pantheon')
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index dbcb992c425c..b273bbece969 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -44,7 +44,7 @@ runCommand "elementary-gsettings-desktop-schemas" {} cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF [org.gnome.desktop.background] - picture-uri='${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png' + picture-uri='file://${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png' primary-color='#000000' ${extraGSettingsOverrides} |