Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 46bf4cb28365
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: df012cc3c4b4
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 14, 2020

  1. libwacom: 1.1 -> 1.3

    @cgevans @worldofpeace
    cgevans authored and worldofpeace committed Apr 14, 2020
    Copy the full SHA
    3b3e5bc View commit details

  2. libwacom: add maintainers

    @worldofpeace
    worldofpeace committed Apr 14, 2020
    Copy the full SHA
    4dc2c5b View commit details

  3. Merge pull request #85051 from cgevans/libwacom-1.3 

    libwacom: 1.1 -> 1.3
    @worldofpeace
    worldofpeace authored Apr 14, 2020
    Copy the full SHA
    df012cc View commit details
Showing with 6 additions and 5 deletions.
  1. +6 −5 pkgs/development/libraries/libwacom/default.nix
11 changes: 6 additions & 5 deletions pkgs/development/libraries/libwacom/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
{ stdenv, fetchFromGitHub, meson, ninja, glib, pkgconfig, udev, libgudev }:
{ stdenv, fetchFromGitHub, meson, ninja, glib, pkgconfig, udev, libgudev, doxygen }:

stdenv.mkDerivation rec {
pname = "libwacom";
version = "1.1";
version = "1.3";

outputs = [ "out" "dev" ];

src = fetchFromGitHub {
owner = "linuxwacom";
repo = "libwacom";
rev = "libwacom-${version}";
sha256 = "037vnyfg7nim6h3f4m04w6a9pr6hi04df14qpys580kf5xnf87nz";
sha256 = "12g8jb67wj6sgg9ar2w8kkw1m1431rn9nd0j64qkrd3vy9g4l0hk";
};

nativeBuildInputs = [ pkgconfig meson ninja ];
nativeBuildInputs = [ pkgconfig meson ninja doxygen ];

mesonFlags = [ "-Dtests=false" ];
mesonFlags = [ "-Dtests=disabled" ];

buildInputs = [ glib udev libgudev ];

meta = with stdenv.lib; {
platforms = platforms.linux;
homepage = "https://linuxwacom.github.io/";
description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux";
maintainers = teams.freedesktop.members;
license = licenses.mit;
};
}