Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libusb1: 1.0.24 -> 1.0.25 #159027

Closed
wants to merge 1 commit into from
Closed

Conversation

Mindavi
Copy link
Contributor

@Mindavi Mindavi commented Feb 10, 2022

Motivation for this change

Closes #135678.

Some testing would be nice, I only built it for now.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/) -> no result/bin folder
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@prusnak
Copy link
Member

prusnak commented Feb 10, 2022

Unfortunately, I don't have time to test this, but the change looks good.

@prusnak prusnak removed their request for review February 10, 2022 22:23
@vcunat
Copy link
Member

vcunat commented Feb 22, 2022

OfBorg says that it fails on aarch64-darwin, whereas before update it seems OK.

EDIT: with x86_64-darwin it's unclear; I find it possible that the change suffers from the same regression there as well.

@prusnak
Copy link
Member

prusnak commented Feb 22, 2022

In order to fix darwin the Security framework needs to be added. With this change libusb1 builds for me for both aarch64-darwin and x86_64-darwin:

diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 384b01b23f8..3762bd57783 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -7,6 +7,7 @@
 , udev
 , libobjc
 , IOKit
+, Security
 , withStatic ? false
 }:
 
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config autoreconfHook ];
   propagatedBuildInputs =
     lib.optional enableUdev udev ++
-    lib.optionals stdenv.isDarwin [ libobjc IOKit ];
+    lib.optionals stdenv.isDarwin [ libobjc IOKit Security ];
 
   dontDisableStatic = withStatic;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index baaed561228..e74f485bc03 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18710,7 +18710,7 @@ with pkgs;
 
   libusb1 = callPackage ../development/libraries/libusb1 {
     inherit (darwin) libobjc;
-    inherit (darwin.apple_sdk.frameworks) IOKit;
+    inherit (darwin.apple_sdk.frameworks) IOKit Security;
     # TODO: remove once `udev` is `systemdMinimal` everywhere.
     udev = systemdMinimal;
   };

@prusnak prusnak mentioned this pull request Feb 22, 2022
13 tasks
@prusnak
Copy link
Member

prusnak commented Feb 22, 2022

Since #160839 has been merged, let's supersede this PR with #161406

@prusnak prusnak closed this Feb 22, 2022
@prusnak prusnak mentioned this pull request Feb 22, 2022
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants