sigtool: 4a3719b4 -> 2a13539d#138453
Conversation
thefloweringash
left a comment
There was a problem hiding this comment.
Thank you for picking this up. There's a little bit more tidy up we can do now that codesign is a regular binary and not a shell script. I don't know of a good way to share suggestions for changes outside of modified files, so here's my version as a gist to compare to: https://gist.github.com/thefloweringash/032517aec4e929c41a85efb24b33e16c
| sha256 = "sha256-iCsdklN3crFx6CKsMIUP/fA3twLh4ArQh7OsVug5UjE="; | ||
| }; | ||
|
|
||
| nativeBuildInputs = [ pkg-config makeWrapper ]; |
There was a problem hiding this comment.
makeWrapper is no longer required, don't forget to remove it from the imports too. Also on the topic of imports, cmake isn't used and should also be removed.
While reviewing NixOS#138453, @thefloweringash recommended two darwin stdenv edits in the following [gist]: 1. a comment on how to simplify boostrapTools.installPhase in the future and 2. an adjustment for a change made by an earlier commit to change `codesign` from being a shell-script wrapper to native binary. [gist]: https://gist.github.com/thefloweringash/032517aec4e929c41a85efb24b33e16c
|
Hi @thefloweringash -- thanks enormously for the review above and for releasing sigtool-0.1.0; I've added three commits to address your review feedback and with that, unless you or other reviewers have additional suggestions, I think we're probably about ready to go here! |
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
|
@ofborg build darwin.sigtool |
|
Thanks, @SuperSandro2000, @alyssais, @thefloweringash, @erdnaxe for all your help getting this done! |
|
Unless I'm wrong the build is now failing on hydra This is now a channel blocker for The error is a little cryptic to me however. I'm happy to test and review if you have any clues as to what might be causing this. |
|
Fixup here: #139271 |
|
Aw, I didn't want to make you drop c++17 features. Filesystem works fine on clang 7, you just have to link the separate libc++fs. But we can do it whichever way you prefer. |
|
I tried bumping clang to clang_11 (with Which made me think it would be easier to remove the one line that used it. |
|
I think you can work around this with _LIBCPP_DISABLE_AVAILABILITY but yeah maybe easier to just get rid of it. |
Motivation for this change
This draft PR proposes updates to
darwin.sigtoolbased on recent upstream development. It is being prepared in anticipation of a forthcoming upstream release (see thefloweringash/sigtool#2) and to facilitate broader testing of the new version against the rest of nixpkgs.Key changes in this new version of
sigtool:codesign.shwrapper script with a newcodesigndriver program implemented directly in C++, hopefully with good drop-in compatibility for various common uses of Apple's originalcodesignbinary.qemu, to access certain*-darwinfeatures likeHypervisor.framework.CC: @thefloweringash
Also potentially relevant to: #130132, #135877.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)Other notes
Since
sigtoolis used bydarwin.stdenv, I anticipate that this or successor PRs will likely require a Darwin mass-rebuild.