lxqt-build-tools: fix darwin detection #123400
Merged
Conversation
This file contains 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
ofborg
bot
added
10.rebuild-darwin: 11-100
10.rebuild-linux: 1-10
10.rebuild-linux: 1
labels
romildo
approved these changes
May 17, 2021
|
Could this not have been done with |
|
Certainly |
|
I wasn't sure what is preferred. I updated the PR. 👍 |
ofborg
bot
added
10.rebuild-linux: 11-100
and removed
10.rebuild-linux: 1
10.rebuild-linux: 1-10
labels
|
@GrahamcOfBorg build lxqt-build-tools |
Comment on lines
27
to
30
| postPatch = lib.optionalString stdenv.isDarwin '' | ||
| substituteInPlace cmake/modules/LXQtCompilerSettings.cmake \ | ||
| --replace AppleClang Clang | ||
| ''; |
There was a problem hiding this comment.
Suggested change
| postPatch = lib.optionalString stdenv.isDarwin '' | |
| substituteInPlace cmake/modules/LXQtCompilerSettings.cmake \ | |
| --replace AppleClang Clang | |
| ''; | |
| postPatch = '' | |
| substituteInPlace cmake/modules/LXQtCompilerSettings.cmake \ | |
| --replace AppleClang Clang | |
| ''; |
Otherwise we might miss it when updating on Linux.
There was a problem hiding this comment.
Updated.
I'm now a little worried in general that this kind of substitution may break something when upstream these conditions in the cmake code. Then again, that'll probably result in a broken Darwin build, or even a broken build everywhere. So I guess it's fine?
|
@ofborg build lxqt.lxqt-build-tools |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation for this change
ZHF: #122042
cc @NixOS/nixos-release-managers
This package detects Darwin via the 'AppleClang' identifier that only applies to Xcode; Nix clang identifies as 'Clang'. This causes dependants to fail linking, for example: https://hydra.nixos.org/build/142959638/nixlog/1
This patch is a stop-gap solution, I think. i don't think it's appropriate to upstream, but I also don't know what the correct solution is.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)