diff options
| author | Daniel Schaefer <git@danielschaefer.me> | 2019-04-25 00:36:19 +0200 |
|---|---|---|
| committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-28 14:23:20 -0400 |
| commit | aa7a9523bdfb2f0964e83ba5c045f02e76be31aa (patch) | |
| tree | 3ef4aac2153c6913d9bfbfd8f83f5ce0adc45e30 | |
| parent | 9da62cb0b362c1587af5fdd4d776c96bb8bc8dc2 (diff) | |
| download | nixlib-aa7a9523bdfb2f0964e83ba5c045f02e76be31aa.tar nixlib-aa7a9523bdfb2f0964e83ba5c045f02e76be31aa.tar.gz nixlib-aa7a9523bdfb2f0964e83ba5c045f02e76be31aa.tar.bz2 nixlib-aa7a9523bdfb2f0964e83ba5c045f02e76be31aa.tar.lz nixlib-aa7a9523bdfb2f0964e83ba5c045f02e76be31aa.tar.xz nixlib-aa7a9523bdfb2f0964e83ba5c045f02e76be31aa.tar.zst nixlib-aa7a9523bdfb2f0964e83ba5c045f02e76be31aa.zip | |
gnome3.gnome-settings-daemon: Use absolute path of mousetweaks
See: https://github.com/NixOS/nixpkgs/pull/60176#issuecomment-486401686
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index f51270bcbd20..a6528c95c19c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -13,6 +13,7 @@ , libgnomekbd , lcms2 , libpulseaudio +, mousetweaks , alsaLib , libcanberra-gtk3 , upower @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - inherit tzdata; + inherit tzdata mousetweaks; }) ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch index 2229302cab7c..272656fae78c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch @@ -13,3 +13,14 @@ typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; +--- a/plugins/mouse/gsd-mouse-manager.c ++++ b/plugins/mouse/gsd-mouse-manager.c +@@ -118,7 +118,7 @@ set_mousetweaks_daemon (GsdMouseManager *manager, + gboolean run_daemon = dwell_click_enabled || secondary_click_enabled; + + if (run_daemon || manager->priv->mousetweaks_daemon_running) +- comm = g_strdup_printf ("mousetweaks %s", ++ comm = g_strdup_printf ("@mousetweaks@/bin/mousetweaks %s", + run_daemon ? "" : "-s"); + else + return; |