JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #58202 from worldofpeace/elementary-default-settings/bump

Browse Source 
pantheon.elementary-default-settings: 5.0 -> 5.1.0
This commit is contained in:
worldofpeace 2019-03-24 07:01:20 -04:00 committed by GitHub
commit 0bc290109a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch
View File

@ -1,7 +1,7 @@
diff --git a/debian/elementary-default-settings.gsettings-override b/debian/elementary-default-settings.gsettings-override diff --git a/overrides/default-settings.gschema.override b/overrides/default-settings.gschema.override
index 6452c30..899972d 100644 index 1aef29c..08de164 100644
--- a/debian/elementary-default-settings.gsettings-override --- a/overrides/default-settings.gschema.override
+++ b/debian/elementary-default-settings.gsettings-override +++ b/overrides/default-settings.gschema.override
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
[net.launchpad.plank.dock.settings] [net.launchpad.plank.dock.settings]
-dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','org.pantheon.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem'] -dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','org.pantheon.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem']

16
pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "default-settings"; pname = "default-settings";
version = "5.0"; version = "5.1.0";
name = "elementary-${pname}-${version}"; name = "elementary-${pname}-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "elementary"; owner = "elementary";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0gyv835qbr90001gda2pzngzzbbk5jf9grgfl25pqkm29s45rqq0"; sha256 = "0l73py4rr56i4dalb2wh1c6qiwmcjkm0l1j75jp5agcnxldh5wym";
}; };
passthru = { passthru = {
@ -21,16 +21,6 @@ stdenv.mkDerivation rec {
}; };
patches = [ patches = [
# See: https://github.com/elementary/default-settings/pull/86 (didn't make 5.0 release)
(fetchpatch {
url = "https://github.com/elementary/default-settings/commit/05d0b2a4e98c28203521d599b40745b46be549fa.patch";
sha256 = "1wk1qva3yzc28gljnkx9hb3pwhqnfrsb08wd76lsl3xnylg0wn2l";
})
# See: https://github.com/elementary/default-settings/pull/94 (didn't make 5.0 release)
(fetchpatch {
url = "https://github.com/elementary/default-settings/commit/a2ca00130c16e805179fb5abd7b624a873dff2da.patch";
sha256 = "1jp1c5d8jfm0404zsylfk7h9vj81s409wgbzbsd2kxmz65icq16x";
})
./correct-override.patch ./correct-override.patch
]; ];
@ -41,7 +31,7 @@ stdenv.mkDerivation rec {
cp -av settings.ini $out/etc/gtk-3.0 cp -av settings.ini $out/etc/gtk-3.0
mkdir -p $out/share/glib-2.0/schemas mkdir -p $out/share/glib-2.0/schemas
cp -av debian/elementary-default-settings.gsettings-override $out/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override cp -av overrides/default-settings.gschema.override $out/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override
mkdir $out/etc/wingpanel.d mkdir $out/etc/wingpanel.d
cp -avr ${./io.elementary.greeter.whitelist} $out/etc/wingpanel.d/io.elementary.greeter.whitelist cp -avr ${./io.elementary.greeter.whitelist} $out/etc/wingpanel.d/io.elementary.greeter.whitelist

9
pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, runCommand, gnome3, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank { stdenv, runCommand, gnome3, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank, gsettings-desktop-schemas
, extraGSettingsOverrides ? "" , extraGSettingsOverrides ? ""
, extraGSettingsOverridePackages ? [] , extraGSettingsOverridePackages ? []
}: }:
@ -6,10 +6,11 @@
let let
gsettingsOverridePackages = [ gsettingsOverridePackages = [
gala
epiphany
elementary-settings-daemon elementary-settings-daemon
epiphany
gala
gnome3.mutter gnome3.mutter
gsettings-desktop-schemas
gtk3 gtk3
plank plank
] ++ extraGSettingsOverridePackages; ] ++ extraGSettingsOverridePackages;
@ -32,8 +33,6 @@ runCommand "elementary-gsettings-desktop-schemas" {}
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]
draw-background=true
picture-options='zoom'
picture-uri='${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png' picture-uri='${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png'
primary-color='#000000' primary-color='#000000'