diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2020-01-20 17:07:59 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-20 17:07:59 -0500 |
commit | 348e48fdccc8efce4c2539922d99d7ecf1542725 (patch) | |
tree | ed656d43fd0b6c80b1560cb317a5be7c4b213587 /pkgs/os-specific | |
parent | cc6d303c163128321ce33d4fd74a4b2c2cd4f0b5 (diff) | |
parent | b7b4e443fcb3b5cf69ba832e529b1bbc7e574afd (diff) | |
download | nixpkgs-348e48fdccc8efce4c2539922d99d7ecf1542725.tar nixpkgs-348e48fdccc8efce4c2539922d99d7ecf1542725.tar.gz nixpkgs-348e48fdccc8efce4c2539922d99d7ecf1542725.tar.bz2 nixpkgs-348e48fdccc8efce4c2539922d99d7ecf1542725.tar.lz nixpkgs-348e48fdccc8efce4c2539922d99d7ecf1542725.tar.xz nixpkgs-348e48fdccc8efce4c2539922d99d7ecf1542725.tar.zst nixpkgs-348e48fdccc8efce4c2539922d99d7ecf1542725.zip |
Merge pull request #78004 from worldofpeace/mtrack-remove
nixos/multitouch: remove (properly known as mtrack)
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/xf86-input-mtrack/default.nix | 42 | ||||
-rw-r--r-- | pkgs/os-specific/linux/xf86-input-multitouch/default.nix | 48 |
2 files changed, 0 insertions, 90 deletions
diff --git a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix deleted file mode 100644 index 2897e9200fd..00000000000 --- a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - stdenv -, fetchurl -, utilmacros -, pkgconfig -, mtdev -, xorgserver -, xorgproto -, pixman -, autoreconfHook -}: - -stdenv.mkDerivation { - name = "xf86-input-mtrack-0.3.0"; - - buildInputs = [ - utilmacros - pkgconfig - mtdev - xorgserver - xorgproto - pixman - autoreconfHook - ]; - - CFLAGS = "-I${pixman}/include/pixman-1"; - - src = fetchurl { - name = "xf86-input-mtrack.tar.gz"; - url = "https://github.com/BlueDragonX/xf86-input-mtrack/tarball/v0.3.0"; - sha256 = "174rdw7gv0wsnjgmwpx4pgjn1zfbylflda4k2dzff6phzxj9yl6v"; - }; - - meta = { - homepage = https://github.com/BlueDragonX/xf86-input-mtrack; - - description = "An Xorg driver for multitouch trackpads"; - - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix deleted file mode 100644 index 71242348f68..00000000000 --- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv -, fetchgit -, mtdev -, pixman -, xorg -, libpciaccess -}: - -stdenv.mkDerivation { - name = "xf86-input-multitouch-20110312"; - - src = fetchgit { - url = http://bitmath.org/git/multitouch.git; - rev = "4d87c041f6a232aa30528d70d4b9946d1824b4ed"; - sha256 = "1jh52d3lkmchn5xdbz4qn50d30nild1zxvfbvwwl2rbmphs5ww6y"; - }; - - # Configuration from http://bitmath.org/code/multitouch/ - confFile = '' - Section "InputClass" - MatchIsTouchpad "true" - Identifier "Multitouch Touchpad" - Driver "multitouch" - EndSection - ''; - - buildInputs = with xorg; [ - mtdev xorgproto libpciaccess libxcb - ]; - - buildPhase = '' - make INCLUDE="$NIX_CFLAGS_COMPILE -I${xorg.xorgserver.dev}/include/xorg -I${pixman}/include/pixman-1 -Iinclude" - ''; - - installPhase = '' - make DESTDIR="$out" LIBDIR="lib" install - mkdir -p $out/include/xorg - echo -n "$confFile" > $out/include/xorg/10-multitouch.conf - ''; - - meta = { - homepage = http://bitmath.org/code/multitouch/; - - description = "Brings multitouch gestures to the Linux desktop"; - - license = stdenv.lib.licenses.gpl2; - }; -} |