diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-28 14:25:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-28 14:25:18 -0400 |
| commit | 5f14e83bd6b9ef1c83b035011267dd3d40278476 (patch) | |
| tree | 5e702df7b34818e570b7b046ff0c5b098c0ddf83 /pkgs/desktops/gnome-3/core | |
| parent | da4f6a2a09e39128c4eb4c8f41fb98e9afdb054a (diff) | |
| parent | 8ffcfdd9a8d62eb7291fc48afc5a6601a22d24d4 (diff) | |
| download | nixpkgs-5f14e83bd6b9ef1c83b035011267dd3d40278476.tar nixpkgs-5f14e83bd6b9ef1c83b035011267dd3d40278476.tar.gz nixpkgs-5f14e83bd6b9ef1c83b035011267dd3d40278476.tar.bz2 nixpkgs-5f14e83bd6b9ef1c83b035011267dd3d40278476.tar.lz nixpkgs-5f14e83bd6b9ef1c83b035011267dd3d40278476.tar.xz nixpkgs-5f14e83bd6b9ef1c83b035011267dd3d40278476.tar.zst nixpkgs-5f14e83bd6b9ef1c83b035011267dd3d40278476.zip | |
Merge pull request #60176 from JohnAZoidberg/mousetweaks
mousetweaks: init at 3.32.0
Diffstat (limited to 'pkgs/desktops/gnome-3/core')
| -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 f51270bcbd2..a6528c95c19 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 2229302cab7..272656fae78 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; |