diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-05 22:47:03 -0400 |
---|---|---|
committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-06 02:48:08 -0400 |
commit | bf0dd34b2c9e4361dc4778dc5058fcae1ee0c57f (patch) | |
tree | aadbe6b2d51da4ea55c28485c3e058b54884d2e5 /pkgs | |
parent | acc66c83aa1fac909f69337df1b468b03ccae4f5 (diff) | |
download | nixlib-bf0dd34b2c9e4361dc4778dc5058fcae1ee0c57f.tar nixlib-bf0dd34b2c9e4361dc4778dc5058fcae1ee0c57f.tar.gz nixlib-bf0dd34b2c9e4361dc4778dc5058fcae1ee0c57f.tar.bz2 nixlib-bf0dd34b2c9e4361dc4778dc5058fcae1ee0c57f.tar.lz nixlib-bf0dd34b2c9e4361dc4778dc5058fcae1ee0c57f.tar.xz nixlib-bf0dd34b2c9e4361dc4778dc5058fcae1ee0c57f.tar.zst nixlib-bf0dd34b2c9e4361dc4778dc5058fcae1ee0c57f.zip |
Revert "pantheon.elementary-settings-daemon: 3.34.1 -> 3.36.0"
Mutter 3.36 in gala is almost ready. This reverts commit 7160b7c31c8a44ffdd0cd0f375624c2c9c834917.
Diffstat (limited to 'pkgs')
3 files changed, 39 insertions, 13 deletions
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 801795ed1ce7..e5aa31ca0fb3 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -43,30 +43,26 @@ stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "3.36.0"; + version = "3.34.1"; repoName = "gnome-settings-daemon"; - src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${repoName}-${version}.tar.xz"; - sha256 = "0jddz8f2j4ps7csgq9b694h9hjxsyhlimik6rb2f8nbcxhrg0bzs"; - }; - - ubuntuSrc = fetchgit { + src = fetchgit { url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${repoName}"; - rev = "refs/tags/ubuntu/3.35.91-1ubuntu1"; - sha256 = "1ifrq89pqarx74mkxykvw2kjyljd28i4ggw90l5bk4jjrwfr66f3"; + rev = "refs/tags/ubuntu/${version}-1ubuntu2"; + sha256 = "0w0dsbzif7v0gk61rs9g20ldlimbdwb5yvlfdc568yyx5z643jbv"; }; # We've omitted the 53_sync_input_sources_to_accountsservice patch because it breaks the build. # See: https://gist.github.com/worldofpeace/2f152a20b7c47895bb93239fce1c9f52 # # Also omit ubuntu_calculator_snap.patch as that's obviously not useful here. - patches = let patchPath = "${ubuntuSrc}/debian/patches"; in [ + patches = let patchPath = "${src}/debian/patches"; in [ (substituteAll { src = ./fix-paths.patch; inherit tzdata; }) + ./global-backlight-helper.patch "${patchPath}/45_suppress-printer-may-not-be-connected-notification.patch" #"${patchPath}/53_sync_input_sources_to_accountsservice.patch" "${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch" @@ -144,6 +140,10 @@ stdenv.mkDerivation rec { # This breaks lightlocker https://github.com/elementary/session-settings/commit/b0e7a2867608c3a3916f9e4e21a68264a20e44f8 # TODO: shouldn't be neeed for the 5.1 greeter (awaiting release) rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop + + # So the polkit policy can reference /run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper + mkdir -p $out/bin/elementary-settings-daemon + ln -s $out/libexec/gsd-backlight-helper $out/bin/elementary-settings-daemon/gsd-backlight-helper ''; passthru = { diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch b/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch index bbc82d78c77d..2229302cab7c 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch @@ -1,15 +1,15 @@ --- a/plugins/datetime/tz.h +++ b/plugins/datetime/tz.h @@ -27,11 +27,7 @@ - + #include <glib.h> - + -#ifndef __sun -# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" -#else -# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" -#endif +#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab" - + typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch b/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch new file mode 100644 index 000000000000..dcdc83934ba6 --- /dev/null +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch @@ -0,0 +1,26 @@ +diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c +index d7d10fd2..5619d6ad 100644 +--- a/plugins/power/gsd-backlight.c ++++ b/plugins/power/gsd-backlight.c +@@ -358,7 +358,7 @@ gsd_backlight_run_set_helper (GsdBacklight *backlight, GTask *task) + proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE, + &error, + "pkexec", +- LIBEXECDIR "/gsd-backlight-helper", ++ "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper", + g_udev_device_get_sysfs_path (backlight->udev_device), + data->value_str, NULL); + } else { +diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in +index f16300f8..79d6bd17 100644 +--- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in ++++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in +@@ -25,7 +25,7 @@ + <allow_inactive>no</allow_inactive> + <allow_active>yes</allow_active> + </defaults> +- <annotate key="org.freedesktop.policykit.exec.path">@libexecdir@/gsd-backlight-helper</annotate> ++ <annotate key="org.freedesktop.policykit.exec.path">/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper</annotate> + </action> + + </policyconfig> |