summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2020-01-20 17:07:59 -0500
committerGitHub <noreply@github.com>2020-01-20 17:07:59 -0500
commit348e48fdccc8efce4c2539922d99d7ecf1542725 (patch)
treeed656d43fd0b6c80b1560cb317a5be7c4b213587 /pkgs/top-level
parentcc6d303c163128321ce33d4fd74a4b2c2cd4f0b5 (diff)
parentb7b4e443fcb3b5cf69ba832e529b1bbc7e574afd (diff)
downloadnixpkgs-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/top-level')
-rw-r--r--pkgs/top-level/aliases.nix3
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 68dfe49545a..c64b56dd5ce 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -475,6 +475,9 @@ mapAliases ({
   xbmcPlugins = kodiPlugins; # added 2018-04-25
   xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01
   xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
+  xf86_input_mtrack = throw ("xf86_input_mtrack has been removed from nixpkgs as it hasn't been maintained"
+    + "and is broken. Working alternatives are libinput and synaptics.");
+  xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs."; # added 2020-01-20
   xlibs = xorg; # added 2015-09
   xpraGtk3 = xpra; # added 2018-09-13
   youtubeDL = youtube-dl;  # added 2014-10-26
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee74eb17f31..519dc633f7c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17226,10 +17226,6 @@ in
 
   xf86_input_cmt = callPackage ../os-specific/linux/xf86-input-cmt { };
 
-  xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { };
-
-  xf86_input_multitouch = callPackage ../os-specific/linux/xf86-input-multitouch { };
-
   xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { };
 
   xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested { };