Merge pull request #319276 from alyssais/libwacom-2.12.1
libwacom: 2.11.0 -> 2.12.1
This commit is contained in:
@@ -8,14 +8,13 @@
|
||||
, udev
|
||||
, libevdev
|
||||
, libgudev
|
||||
, libxml2
|
||||
, python3
|
||||
, valgrind
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libwacom";
|
||||
version = "2.11.0";
|
||||
version = "2.12.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@@ -23,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "linuxwacom";
|
||||
repo = "libwacom";
|
||||
rev = "libwacom-${version}";
|
||||
hash = "sha256-TQOe954Zos3VpAG5M/O5je9dr8d4gOXIwy4xl3o+e1g=";
|
||||
hash = "sha256-dxnXh+O/8q8ShsPbpqvaBPNQR6lJBphBolYTmcJEF/0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -53,10 +52,6 @@ stdenv.mkDerivation rec {
|
||||
"-Dtests=${if doCheck then "enabled" else "disabled"}"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
libxml2
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
valgrind
|
||||
(python3.withPackages (ps: with ps; [
|
||||
|
||||
@@ -7,8 +7,8 @@ let
|
||||
libwacom-surface = fetchFromGitHub {
|
||||
owner = "linux-surface";
|
||||
repo = "libwacom-surface";
|
||||
rev = "v2.10.0-1";
|
||||
hash = "sha256-5/9X20veXazXEdSDGY5aMGQixulqMlC5Av0NGOF9m98=";
|
||||
rev = "v2.12.0-1";
|
||||
hash = "sha256-z/qNXbe89/0GIDj0BDQY6xdjHKA9chAPpviHPtBLjFM=";
|
||||
};
|
||||
in libwacom.overrideAttrs (old: {
|
||||
pname = "libwacom-surface";
|
||||
|
||||
Reference in New Issue
Block a user