lol

touchegg: 1.1.1 -> 2.0.11

Co-Authored-By: Audrey MP <astatide@users.noreply.github.com>
Co-Authored-By: Rasmus T. Bjerg <rs.bjerg@gmail.com>

+46 -15
+46 -15
pkgs/tools/inputmethods/touchegg/default.nix
··· 1 - { lib, stdenv, fetchurl, xorg, xorgserver, qt4, libGLU, libGL, geis, qmake4Hook }: 1 + { stdenv, lib 2 + , fetchFromGitHub 3 + , fetchpatch 4 + , systemd 5 + , libinput 6 + , pugixml 7 + , cairo 8 + , xorg 9 + , gtk3-x11 10 + , pcre 11 + , pkg-config 12 + , cmake 13 + , pantheon 14 + }: 2 15 3 16 stdenv.mkDerivation rec { 4 17 pname = "touchegg"; 5 - version = "1.1.1"; 6 - src = fetchurl { 7 - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/touchegg/${pname}-${version}.tar.gz"; 8 - sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038"; 18 + version = "2.0.11"; 19 + src = fetchFromGitHub { 20 + owner = "JoseExposito"; 21 + repo = pname; 22 + rev = version; 23 + sha256 = "1zfiqs5vqlb6drnqx9nsmhgy8qc6svzr8zyjkqvwkpbgrc6ifap9"; 9 24 }; 10 25 11 - buildInputs = [ xorgserver libGLU libGL xorg.libX11 xorg.libXtst xorg.libXext qt4 geis ]; 26 + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; 12 27 13 - nativeBuildInputs = [ qmake4Hook ]; 28 + buildInputs = [ 29 + systemd 30 + libinput 31 + pugixml 32 + cairo 33 + gtk3-x11 34 + pcre 35 + ] ++ (with xorg; [ 36 + libX11 37 + libXtst 38 + libXrandr 39 + libXi 40 + libXdmcp 41 + libpthreadstubs 42 + libxcb 43 + ]); 14 44 15 - preConfigure = '' 16 - sed -e "s@/usr/@$out/@g" -i $(find . -name touchegg.pro) 17 - sed -e "s@/usr/@$out/@g" -i $(find ./src/touchegg/config/ -name Config.cpp) 18 - ''; 45 + nativeBuildInputs = [ 46 + pkg-config 47 + cmake 48 + ]; 19 49 20 - meta = { 50 + meta = with lib; { 21 51 homepage = "https://github.com/JoseExposito/touchegg"; 22 - description = "Macro binding for touch surfaces"; 23 - license = lib.licenses.gpl2; 24 - platforms = lib.platforms.linux; 52 + description = "Linux multi-touch gesture recognizer"; 53 + license = licenses.gpl3Plus; 54 + platforms = platforms.linux; 55 + maintainers = pantheon.maintainers; 25 56 }; 26 57 }