pyrox.dev
Merge pull request #154102 from bobby285271/touchegg
touchegg: 2.0.12 -> 2.0.13
authored by
Bobby Rong
and committed by
GitHub
12a53e95
27d2fe1e
+25
-16
pkgs/tools/inputmethods/touchegg/default.nix
+25
-16
pkgs/tools/inputmethods/touchegg/default.nix
···
1
-
{ stdenv, lib
1
+
{ stdenv
2
+
, lib
2
3
, fetchFromGitHub
3
4
, fetchpatch
5
+
, nix-update-script
4
6
, systemd
5
7
, libinput
6
8
, pugixml
···
16
18
17
19
stdenv.mkDerivation rec {
18
20
pname = "touchegg";
19
-
version = "2.0.12";
21
+
version = "2.0.13";
22
+
20
23
src = fetchFromGitHub {
21
24
owner = "JoseExposito";
22
25
repo = pname;
23
26
rev = version;
24
-
sha256 = "sha256-oJzehs7oLFTDn7GSm6bY/77tEfyEdlANn69EdCApdPA=";
27
+
sha256 = "sha256-wfXA4+HSLFHMvdsnyiTfRxPqdSsvd0RMkKIacf+rLZI=";
25
28
};
26
29
27
-
PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
30
+
patches = lib.optionals withPantheon [
31
+
# Disable per-application gesture by default to make sure the default
32
+
# config does not conflict with Pantheon switchboard settings.
33
+
(fetchpatch {
34
+
url = "https://github.com/elementary/os-patches/commit/7d9b133e02132d7f13cf2fe850b2fe4c015c3c5e.patch";
35
+
sha256 = "sha256-ZOGVkxiXoTORXC6doz5r9IObAbYjhsDjgg3HtzlTSUc=";
36
+
})
37
+
];
38
+
39
+
nativeBuildInputs = [
40
+
pkg-config
41
+
cmake
42
+
];
28
43
29
44
buildInputs = [
30
45
systemd
···
43
58
libxcb
44
59
]);
45
60
46
-
nativeBuildInputs = [
47
-
pkg-config
48
-
cmake
49
-
];
61
+
PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
50
62
51
-
patches = lib.optionals withPantheon [
52
-
# Disable per-application gesture by default to make sure the default
53
-
# config does not conflict with Pantheon switchboard settings.
54
-
(fetchpatch {
55
-
url = "https://github.com/elementary/os-patches/commit/ada4e726540a2bb57b606c98e2531cfaaea57211.patch";
56
-
sha256 = "0is9acwvgiqdhbiw11i3nq0rp0zldcza779fbj8k78cp329rbqb4";
57
-
})
58
-
];
63
+
passthru = {
64
+
updateScript = nix-update-script {
65
+
attrPath = pname;
66
+
};
67
+
};
59
68
60
69
meta = with lib; {
61
70
homepage = "https://github.com/JoseExposito/touchegg";