vengi-tools: fix build on darwin#399609
Merged
emilazy merged 2 commits intoNixOS:masterfrom Apr 23, 2025
Merged
Conversation
github-actions
bot
added
10.rebuild-darwin: 1
Contributor
Author
|
Contributor
Author
|
x86-64 build failure is an existing issue with darwin toolchain on 15.4: |
13 tasks
Member
is this something that will be fixed in the toolchain, or should we mark this as broken for x86_64-darwin? |
Contributor
Author
fgaz
reviewed
Apr 18, 2025
booxter
force-pushed
the
vengi-tools-darwin
branch
from
6b02301 to
02555a0
Compare
Also, move *.app bundles under /Applications/ directory. Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
booxter
force-pushed
the
vengi-tools-darwin
branch
from
02555a0 to
3a2b22a
Compare
Contributor
Author
|
It's a CLI tool and so should be available outside of an .app bundle. This also fixes passthru.tests on darwin. Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Contributor
Author
|
Contributor
Author
|
13 tasks
emilazy
approved these changes
Apr 23, 2025
Comment on lines
+47
to
+49
| # Disable code signing on macOS | ||
| substituteInPlace cmake/macros.cmake --replace-fail "codesign" "true" | ||
| substituteInPlace cmake/system/apple.cmake --replace-fail "if(APPLE)" "if(false)" |
Member
There was a problem hiding this comment.
FWIW, adding sigtool to the nativeBuildInputs may suffice.
Comment on lines
+51
to
+52
| # calls otool -L on /usr/lib/libSystem.B.dylib and fails because it doesn't exist | ||
| substituteInPlace cmake/applebundle.cmake --replace-fail 'fixup_bundle("''${TARGET_BUNDLE_DIR}" "" "")' "" |
Member
There was a problem hiding this comment.
This is a CMake bug we can hopefully fix for 25.11, but other packages are already working around it, so this seems fine.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Also, move *.app bundles under /Applications/ directory.
Signed-off-by: Ihar Hrachyshka ihar.hrachyshka@gmail.com
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.