touchegg: remove unused pcre dependency, modernize (#412110)
This commit is contained in:
@@ -10,22 +10,20 @@
|
||||
cairo,
|
||||
xorg,
|
||||
gtk3-x11,
|
||||
pcre,
|
||||
pkg-config,
|
||||
cmake,
|
||||
pantheon,
|
||||
withPantheon ? false,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "touchegg";
|
||||
version = "2.0.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JoseExposito";
|
||||
repo = "touchegg";
|
||||
rev = version;
|
||||
sha256 = "sha256-7LJ5gD2e6e4edKDabqmsiXTdNKJ39557Q4sEGWF8H1U=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-7LJ5gD2e6e4edKDabqmsiXTdNKJ39557Q4sEGWF8H1U=";
|
||||
};
|
||||
|
||||
patches = lib.optionals withPantheon [
|
||||
@@ -33,14 +31,14 @@ stdenv.mkDerivation rec {
|
||||
# Reverts https://github.com/JoseExposito/touchegg/pull/603
|
||||
(fetchpatch {
|
||||
url = "https://github.com/JoseExposito/touchegg/commit/34e947181d84620021601e7f28deb1983a154da8.patch";
|
||||
sha256 = "sha256-qbWwmEzVXvDAhhrGvMkKN4YNtnFfRW+Yra+i6VEQX4g=";
|
||||
hash = "sha256-qbWwmEzVXvDAhhrGvMkKN4YNtnFfRW+Yra+i6VEQX4g=";
|
||||
revert = true;
|
||||
})
|
||||
# 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=";
|
||||
hash = "sha256-ZOGVkxiXoTORXC6doz5r9IObAbYjhsDjgg3HtzlTSUc=";
|
||||
})
|
||||
];
|
||||
|
||||
@@ -56,7 +54,6 @@ stdenv.mkDerivation rec {
|
||||
pugixml
|
||||
cairo
|
||||
gtk3-x11
|
||||
pcre
|
||||
]
|
||||
++ (with xorg; [
|
||||
libX11
|
||||
@@ -74,12 +71,12 @@ stdenv.mkDerivation rec {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/JoseExposito/touchegg";
|
||||
description = "Linux multi-touch gesture recognizer";
|
||||
mainProgram = "touchegg";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
teams = [ teams.pantheon ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
teams = [ lib.teams.pantheon ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user