Skip to content

libfido2: 1.3.0 -> 1.3.1#80781

Closed
prusnak wants to merge 1 commit intoNixOS:masterfrom
prusnak:libfido2
Closed

libfido2: 1.3.0 -> 1.3.1#80781
prusnak wants to merge 1 commit intoNixOS:masterfrom
prusnak:libfido2

Conversation

@prusnak
Copy link
Member

@prusnak prusnak commented Feb 22, 2020 •
edited
Loading

Motivation for this change
  • version update
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Feb 22, 2020
@ofborg ofborg bot requested a review from dtzWill February 22, 2020 09:19
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Feb 22, 2020
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. and removed 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. labels Feb 22, 2020
@artemist
Copy link
Member

artemist commented Feb 22, 2020

I think you missed your macOS fixes, this still has platforms = platforms.linux; and doesn't pass IOKit.

@prusnak
Copy link
Member Author

prusnak commented Feb 22, 2020 •
edited
Loading

As explained here: #80196 (comment) simply switching from platforms.linux to platforms.unix plus adding IOKit to buildInputs for darwin did not fix the issue (the build still fails on #include <IOKit/IOKitlib.h>), so I changed #80196 to not use libfido2 for darwin.

I have no way to test and debug locally on macos/darwin and debugging via gramacofborg bot is tedious and not very reasonable.

@artemist
Copy link
Member

artemist commented Feb 22, 2020

Okay, reasonable. I'll try to work on fixing it on Darwin and make a separate PR. You might want to edit your PR text though.

@prusnak
Copy link
Member Author

prusnak commented Feb 22, 2020

@artemist PR text fixed, sorry about that. Will gladly review your PR once you figure out how to fix the issue.

artemist added a commit to artemist/nixpkgs that referenced this pull request Feb 23, 2020
@artemist
libfido2: add macOS support
099359a 
* pass IOKit to libfido2
* Add a patch so that cmake uses lld flags when linking
* Upgrade from 1.3.0 to 1.3.1 (based off NixOS#80781)
* Specify CMAKE_INSTALL_LIBDIR so that the demo binaries link
  correctly on macOS and libfido2.pc specifies correct arguments
@artemist artemist mentioned this pull request Feb 23, 2020
Merged
10 tasks
@prusnak
Copy link
Member Author

prusnak commented Feb 23, 2020

Deprecated in favor of #80909

@prusnak prusnak closed this Feb 23, 2020
@prusnak prusnak deleted the libfido2 branch February 23, 2020 20:07
prusnak pushed a commit to prusnak/nixpkgs that referenced this pull request Feb 29, 2020
@artemist @prusnak
libfido2: add macOS support
9ea34a5 
* pass IOKit to libfido2
* Add a patch so that cmake uses lld flags when linking
* Upgrade from 1.3.0 to 1.3.1 (based off NixOS#80781)
* Specify CMAKE_INSTALL_LIBDIR so that the demo binaries link
  correctly on macOS and libfido2.pc specifies correct arguments

(cherry picked from commit 099359a)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dtzWill dtzWill Awaiting requested review from dtzWill

Assignees

No one assigned

Labels

8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@prusnak @artemist