summary refs log tree commit diff
path: root/pkgs/development/libraries/libinput
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-10-26 08:17:14 +0100
committerVladimír Čunát <v@cunat.cz>2020-10-26 08:19:17 +0100
commit336bc8283bd4ef288e60c5fdb1b67196b9ea5c85 (patch)
tree8812d7fef1d0ed89d4507279511f35e2c050097c /pkgs/development/libraries/libinput
parent309ce3f8a1127a5dff1dcc2512777122d49529d4 (diff)
downloadnixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.gz
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.bz2
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.lz
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.xz
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.zst
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.zip
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
Diffstat (limited to 'pkgs/development/libraries/libinput')
-rw-r--r--pkgs/development/libraries/libinput/default.nix17
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 576a2fec921..3a651087510 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, meson, ninja
+{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja
 , libevdev, mtdev, udev, libwacom
 , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation
 , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support
@@ -27,11 +27,14 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "libinput";
-  version = "1.16.1";
-
-  src = fetchurl {
-    url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz";
-    sha256 = "e6fRru3RUWi7IdF+nmKKocJ5V5Y6Qjo/6jk4pQF1hTk=";
+  version = "1.16.2";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = pname;
+    repo = pname;
+    rev = version;
+    sha256 = "0qii6yh3dlhgv9z970cpzbz19ii8zjvq4k7pg75sy2gmia7smwd1";
   };
 
   outputs = [ "bin" "out" "dev" ];
@@ -80,7 +83,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver";
-    homepage    = "http://www.freedesktop.org/wiki/Software/libinput";
+    homepage    = "https://www.freedesktop.org/wiki/Software/libinput/";
     license     = licenses.mit;
     platforms   = platforms.unix;
     maintainers = with maintainers; [ codyopel ];