diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/libusb1 | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libusb1')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libusb1/default.nix | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libusb1/default.nix b/nixpkgs/pkgs/development/libraries/libusb1/default.nix index 1514d2702103..3b23402fe33c 100644 --- a/nixpkgs/pkgs/development/libraries/libusb1/default.nix +++ b/nixpkgs/pkgs/development/libraries/libusb1/default.nix @@ -7,33 +7,27 @@ , udev , libobjc , IOKit +, Security , withStatic ? false }: stdenv.mkDerivation rec { pname = "libusb"; - version = "1.0.24"; + version = "1.0.26"; src = fetchFromGitHub { owner = "libusb"; repo = "libusb"; rev = "v${version}"; - sha256 = "18ri8ky422hw64zry7bpbarb1m0hiljyf64a0a9y093y7aad38i7"; + sha256 = "sha256-LEy45YiFbueCCi8d2hguujMsxBezaTUERHUpFsTKGZQ="; }; outputs = [ "out" "dev" ]; - patches = [ (fetchpatch { - # https://bugs.archlinux.org/task/69121 - url = "https://github.com/libusb/libusb/commit/f6d2cb561402c3b6d3627c0eb89e009b503d9067.patch"; - sha256 = "1dbahikcbwkjhyvks7wbp7fy2bf7nca48vg5z0zqvqzjb9y595cq"; - excludes = [ "libusb/version_nano.h" ]; - }) ]; - nativeBuildInputs = [ pkg-config autoreconfHook ]; propagatedBuildInputs = lib.optional enableUdev udev ++ - lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; dontDisableStatic = withStatic; |