From 5b3d64470973828c4e3c2d6da46f678879bb9317 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 17 Oct 2021 19:13:58 +0200 Subject: [PATCH] hidapi: 0.10.1 -> 0.11.0 switch buildsystem to cmake --- pkgs/development/libraries/hidapi/default.nix | 27 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index 6a3665809b4a..70e9a39e03fe 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -1,32 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, udev, libusb1 -, darwin }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, libusb1 +, udev +, Cocoa +, IOKit +}: stdenv.mkDerivation rec { pname = "hidapi"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "libusb"; repo = "hidapi"; rev = "${pname}-${version}"; - sha256 = "1nr4z4b10vpbh3ss525r7spz4i43zim2ba5qzfl15dgdxshxxivb"; + sha256 = "0dzigvmwbg20b33xn0sklnf489m8g84yrcm8kqlrsd7x8iymsg63"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ libusb1 udev ]; + buildInputs = lib.optionals stdenv.isLinux [ libusb1 udev ]; enableParallelBuilding = true; - propagatedBuildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit Cocoa ]); + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Cocoa IOKit ]; meta = with lib; { description = "Library for communicating with USB and Bluetooth HID devices"; homepage = "https://github.com/libusb/hidapi"; maintainers = with maintainers; [ prusnak ]; - # Actually, you can chose between GPLv3, BSD or HIDAPI license (more liberal) - license = licenses.bsd3; + # You can choose between GPLv3, BSD or HIDAPI license (even more liberal) + license = with licenses; [ bsd3 /* or */ gpl3Only ] ; platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0dbf7db8cece..4c8f9c970bfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16635,9 +16635,9 @@ with pkgs; herqq = libsForQt5.callPackage ../development/libraries/herqq { }; hidapi = callPackage ../development/libraries/hidapi { + inherit (darwin.apple_sdk.frameworks) Cocoa IOKit; # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; - autoreconfHook = buildPackages.autoreconfHook269; }; highfive = callPackage ../development/libraries/highfive { };