mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 17:10:48 +00:00
pantheon.elementary-settings-daemon: Use absolute path of mousetweaks
This commit is contained in:
parent
aa7a9523bd
commit
8ffcfdd9a8
|
@ -22,6 +22,7 @@
|
||||||
, libxml2
|
, libxml2
|
||||||
, libxslt
|
, libxslt
|
||||||
, meson
|
, meson
|
||||||
|
, mousetweaks
|
||||||
, networkmanager
|
, networkmanager
|
||||||
, ninja
|
, ninja
|
||||||
, nss
|
, nss
|
||||||
|
@ -30,12 +31,12 @@
|
||||||
, pkgconfig
|
, pkgconfig
|
||||||
, polkit
|
, polkit
|
||||||
, python3
|
, python3
|
||||||
|
, stdenv
|
||||||
, substituteAll
|
, substituteAll
|
||||||
, systemd
|
, systemd
|
||||||
, tzdata
|
, tzdata
|
||||||
, upower
|
, upower
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
, stdenv
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -63,7 +64,7 @@ stdenv.mkDerivation rec {
|
||||||
patches = let patchPath = "${src2}/debian/patches"; in [
|
patches = let patchPath = "${src2}/debian/patches"; in [
|
||||||
(substituteAll {
|
(substituteAll {
|
||||||
src = ./fix-paths.patch;
|
src = ./fix-paths.patch;
|
||||||
inherit tzdata;
|
inherit tzdata mousetweaks;
|
||||||
})
|
})
|
||||||
"${patchPath}/45_suppress-printer-may-not-be-connected-notification.patch"
|
"${patchPath}/45_suppress-printer-may-not-be-connected-notification.patch"
|
||||||
"${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch"
|
"${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch"
|
||||||
|
|
|
@ -13,3 +13,14 @@
|
||||||
|
|
||||||
typedef struct _TzDB TzDB;
|
typedef struct _TzDB TzDB;
|
||||||
typedef struct _TzLocation TzLocation;
|
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;
|
||||||
|
|
Loading…
Reference in a new issue