diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-01-09 21:04:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-09 21:04:42 +0800 |
| commit | 12a53e95a69a983ba49ce569ca42b9f9bda00e52 (patch) | |
| tree | 67b00a2d985970c3a95e4268a021aa4dd25cb8f6 /pkgs/tools | |
| parent | 27d2fe1e69deb1894f9113a1fe2ca43fb89c8ad1 (diff) | |
| parent | d5e4ceac727c4b28a139c7707e5e5cc8eaf74a35 (diff) | |
Merge pull request #154102 from bobby285271/touchegg
touchegg: 2.0.12 -> 2.0.13
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/inputmethods/touchegg/default.nix | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index a50770c73559f..c788907727170 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -1,6 +1,8 @@ -{ stdenv, lib +{ stdenv +, lib , fetchFromGitHub , fetchpatch +, nix-update-script , systemd , libinput , pugixml @@ -16,15 +18,28 @@ stdenv.mkDerivation rec { pname = "touchegg"; - version = "2.0.12"; + version = "2.0.13"; + src = fetchFromGitHub { owner = "JoseExposito"; repo = pname; rev = version; - sha256 = "sha256-oJzehs7oLFTDn7GSm6bY/77tEfyEdlANn69EdCApdPA="; + sha256 = "sha256-wfXA4+HSLFHMvdsnyiTfRxPqdSsvd0RMkKIacf+rLZI="; }; - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + patches = lib.optionals withPantheon [ + # Disable per-application gesture by default to make sure the default + # config does not conflict with Pantheon switchboard settings. + (fetchpatch { + url = "https://github.com/elementary/os-patches/commit/7d9b133e02132d7f13cf2fe850b2fe4c015c3c5e.patch"; + sha256 = "sha256-ZOGVkxiXoTORXC6doz5r9IObAbYjhsDjgg3HtzlTSUc="; + }) + ]; + + nativeBuildInputs = [ + pkg-config + cmake + ]; buildInputs = [ systemd @@ -43,19 +58,13 @@ stdenv.mkDerivation rec { libxcb ]); - nativeBuildInputs = [ - pkg-config - cmake - ]; + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; - patches = lib.optionals withPantheon [ - # Disable per-application gesture by default to make sure the default - # config does not conflict with Pantheon switchboard settings. - (fetchpatch { - url = "https://github.com/elementary/os-patches/commit/ada4e726540a2bb57b606c98e2531cfaaea57211.patch"; - sha256 = "0is9acwvgiqdhbiw11i3nq0rp0zldcza779fbj8k78cp329rbqb4"; - }) - ]; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; meta = with lib; { homepage = "https://github.com/JoseExposito/touchegg"; |