diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/os-specific/linux/xf86-input-wacom | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/os-specific/linux/xf86-input-wacom')
-rw-r--r-- | pkgs/os-specific/linux/xf86-input-wacom/default.nix | 68 |
1 files changed, 49 insertions, 19 deletions
diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 8a7541afa69..4ebc4ed7663 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -1,31 +1,61 @@ -{ stdenv, fetchurl -, xorgproto, libX11, libXext, libXi, libXrandr, libXrender -, ncurses, pkgconfig, xorgserver, udev, libXinerama, pixman }: +{ lib +, stdenv +, autoreconfHook +, fetchFromGitHub +, xorgproto +, libX11 +, libXext +, libXi +, libXinerama +, libXrandr +, libXrender +, ncurses +, pixman +, pkg-config +, udev +, utilmacros +, xorgserver +}: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.36.0"; + pname = "xf86-input-wacom"; + version = "0.40.0"; - src = fetchurl { - url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "1xi39hl8ddgj9m7m2k2ll2r3wh0k0aq45fvrsv43651bhz9cbrza"; + src = fetchFromGitHub { + owner = "linuxwacom"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "sha256-0U4pAB5vsIlBewCBqQ4SLHDrwqtr9nh7knZpXZMkzck="; }; - buildInputs = [ xorgproto libX11 libXext libXi libXrandr libXrender - ncurses pkgconfig xorgserver udev libXinerama pixman ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; - preConfigure = '' - mkdir -p $out/share/X11/xorg.conf.d - configureFlags="--with-xorg-module-dir=$out/lib/xorg/modules - --with-sdkdir=$out/include/xorg --with-xorg-conf-dir=$out/share/X11/xorg.conf.d" - ''; + buildInputs = [ + libX11 + libXext + libXi + libXinerama + libXrandr + libXrender + ncurses + udev + utilmacros + pixman + xorgproto + xorgserver + ]; - CFLAGS = "-I${pixman}/include/pixman-1"; + configureFlags = [ + "--with-xorg-module-dir=${placeholder "out"}/lib/xorg/modules" + "--with-sdkdir=${placeholder "out"}/include/xorg" + "--with-xorg-conf-dir=${placeholder "out"}/share/X11/xorg.conf.d" + ]; - meta = with stdenv.lib; { - maintainers = [ maintainers.goibhniu ]; + meta = with lib; { + maintainers = with maintainers; [ goibhniu fortuneteller2k ]; description = "Wacom digitizer driver for X11"; homepage = "http://linuxwacom.sourceforge.net"; - license = licenses.gpl2; - platforms = platforms.linux; # Probably, works with other unices as well + license = licenses.gpl2Only; + platforms = platforms.linux; # Probably, works with other unixes as well }; } |