From 0a9a03f95e6445405fc3e8a102f9e91a5bed4624 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Sep 2021 18:41:09 +0200 Subject: [PATCH] libwacom: 1.11 -> 1.12 Remove doxygen, it was never installed and upstream now does not even build it by default. Also reformat the expression. --- .../libraries/libwacom/default.nix | 33 +++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 0d7caf8ba5c4..9ebb2c855cba 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -1,8 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, glib, pkg-config, udev, libgudev, doxygen, python3 }: +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +, glib +, pkg-config +, udev +, libgudev +, python3 +}: stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.11"; + version = "1.12"; outputs = [ "out" "dev" ]; @@ -10,14 +20,25 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-HDBWycdZf/pUL7ZzCuF55tfby3GW0WW6Vq3htPWT1v4="; + sha256 = "sha256-pCO0lB0liveIEZIxY3IJcqlmWy4rYhSBtRPssfzHEow="; }; - nativeBuildInputs = [ pkg-config meson ninja doxygen python3 ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + python3 + ]; - mesonFlags = [ "-Dtests=disabled" ]; + buildInputs = [ + glib + udev + libgudev + ]; - buildInputs = [ glib udev libgudev ]; + mesonFlags = [ + "-Dtests=disabled" + ]; meta = with lib; { platforms = platforms.linux;