JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #154102 from bobby285271/touchegg

Browse Source 
touchegg: 2.0.12 -> 2.0.13
This commit is contained in:
Bobby Rong 2022-01-09 21:04:42 +08:00 committed by GitHub
commit 12a53e95a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkgs/tools/inputmethods/touchegg/default.nix
View File

@ -1,6 +1,8 @@
{ stdenv, lib { stdenv
, lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, nix-update-script
, systemd , systemd
, libinput , libinput
, pugixml , pugixml
@ -16,15 +18,28 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "touchegg"; pname = "touchegg";
version = "2.0.12"; version = "2.0.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "JoseExposito"; owner = "JoseExposito";
repo = pname; repo = pname;
rev = version; 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 = [ buildInputs = [
systemd systemd
@ -43,19 +58,13 @@ stdenv.mkDerivation rec {
libxcb libxcb
]); ]);
nativeBuildInputs = [ PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
pkg-config
cmake
];
patches = lib.optionals withPantheon [ passthru = {
# Disable per-application gesture by default to make sure the default updateScript = nix-update-script {
# config does not conflict with Pantheon switchboard settings. attrPath = pname;
(fetchpatch { };
url = "https://github.com/elementary/os-patches/commit/ada4e726540a2bb57b606c98e2531cfaaea57211.patch"; };
sha256 = "0is9acwvgiqdhbiw11i3nq0rp0zldcza779fbj8k78cp329rbqb4";
})
];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/JoseExposito/touchegg"; homepage = "https://github.com/JoseExposito/touchegg";