alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

pantheon.elementary-default-settings: 5.0 -> 5.1.0

Browse source 
https://github.com/elementary/default-settings/releases/tag/5.1.0
This commit is contained in:
worldofpeace 2019-03-24 06:14:30 -04:00
parent 1e86c0a7df
commit b3f6ade2b7
2 changed files with 7 additions and 17 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
index 6452c30..899972d 100644
--- 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 1aef29c..08de164 100644
--- a/overrides/default-settings.gschema.override
+++ b/overrides/default-settings.gschema.override
@@ -1,5 +1,5 @@
[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']

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

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "default-settings";
version = "5.0";
version = "5.1.0";
name = "elementary-${pname}-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0gyv835qbr90001gda2pzngzzbbk5jf9grgfl25pqkm29s45rqq0";
sha256 = "0l73py4rr56i4dalb2wh1c6qiwmcjkm0l1j75jp5agcnxldh5wym";
};
passthru = {
@ -21,16 +21,6 @@ stdenv.mkDerivation rec {
};
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
];
@ -41,7 +31,7 @@ stdenv.mkDerivation rec {
cp -av settings.ini $out/etc/gtk-3.0
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
cp -avr ${./io.elementary.greeter.whitelist} $out/etc/wingpanel.d/io.elementary.greeter.whitelist