Merge pull request #154102 from bobby285271/touchegg
touchegg: 2.0.12 -> 2.0.13
This commit is contained in:
commit
12a53e95a6
1 changed files with 25 additions and 16 deletions
|
@ -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";
|
||||
|
|
Loading…
Reference in a new issue