mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 03:23:29 +03:00
touchegg: modernize
This commit is contained in:
parent
5dce1034d6
commit
baffb1d464
1 changed files with 10 additions and 11 deletions
|
@ -12,19 +12,18 @@
|
||||||
gtk3-x11,
|
gtk3-x11,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
cmake,
|
cmake,
|
||||||
pantheon,
|
|
||||||
withPantheon ? false,
|
withPantheon ? false,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "touchegg";
|
pname = "touchegg";
|
||||||
version = "2.0.18";
|
version = "2.0.18";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "JoseExposito";
|
owner = "JoseExposito";
|
||||||
repo = "touchegg";
|
repo = "touchegg";
|
||||||
rev = version;
|
tag = finalAttrs.version;
|
||||||
sha256 = "sha256-7LJ5gD2e6e4edKDabqmsiXTdNKJ39557Q4sEGWF8H1U=";
|
hash = "sha256-7LJ5gD2e6e4edKDabqmsiXTdNKJ39557Q4sEGWF8H1U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = lib.optionals withPantheon [
|
patches = lib.optionals withPantheon [
|
||||||
|
@ -32,14 +31,14 @@ stdenv.mkDerivation rec {
|
||||||
# Reverts https://github.com/JoseExposito/touchegg/pull/603
|
# Reverts https://github.com/JoseExposito/touchegg/pull/603
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://github.com/JoseExposito/touchegg/commit/34e947181d84620021601e7f28deb1983a154da8.patch";
|
url = "https://github.com/JoseExposito/touchegg/commit/34e947181d84620021601e7f28deb1983a154da8.patch";
|
||||||
sha256 = "sha256-qbWwmEzVXvDAhhrGvMkKN4YNtnFfRW+Yra+i6VEQX4g=";
|
hash = "sha256-qbWwmEzVXvDAhhrGvMkKN4YNtnFfRW+Yra+i6VEQX4g=";
|
||||||
revert = true;
|
revert = true;
|
||||||
})
|
})
|
||||||
# Disable per-application gesture by default to make sure the default
|
# Disable per-application gesture by default to make sure the default
|
||||||
# config does not conflict with Pantheon switchboard settings.
|
# config does not conflict with Pantheon switchboard settings.
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://github.com/elementary/os-patches/commit/7d9b133e02132d7f13cf2fe850b2fe4c015c3c5e.patch";
|
url = "https://github.com/elementary/os-patches/commit/7d9b133e02132d7f13cf2fe850b2fe4c015c3c5e.patch";
|
||||||
sha256 = "sha256-ZOGVkxiXoTORXC6doz5r9IObAbYjhsDjgg3HtzlTSUc=";
|
hash = "sha256-ZOGVkxiXoTORXC6doz5r9IObAbYjhsDjgg3HtzlTSUc=";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -72,12 +71,12 @@ stdenv.mkDerivation rec {
|
||||||
updateScript = nix-update-script { };
|
updateScript = nix-update-script { };
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
homepage = "https://github.com/JoseExposito/touchegg";
|
homepage = "https://github.com/JoseExposito/touchegg";
|
||||||
description = "Linux multi-touch gesture recognizer";
|
description = "Linux multi-touch gesture recognizer";
|
||||||
mainProgram = "touchegg";
|
mainProgram = "touchegg";
|
||||||
license = licenses.gpl3Plus;
|
license = lib.licenses.gpl3Plus;
|
||||||
platforms = platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
teams = [ teams.pantheon ];
|
teams = [ lib.teams.pantheon ];
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue