meson: Fix my mistakes #86283
Merged
meson: Fix my mistakes #86283
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
The old `CC=.. CXX= .. meson ...` env var hack I removed in 3c00ca0 had a side effect of ensuring that Meson always had access to a native C compiler, which unforunately it expects in most cases. Thankfully, that will be fixed soon.
In my haste to unbreak eval, I screwed up and got the bit-widths, backwards.
Ericson2314
commented
Apr 29, 2020
| @@ -58,6 +59,10 @@ python3Packages.buildPythonApplication rec { | |||
|
|
|||
| setupHook = ./setup-hook.sh; | |||
|
|
|||
| # Ensure there will always be a native C compiler when meson is used, as a | |||
| # workaround until https://github.com/mesonbuild/meson/pull/6512 lands. | |||
| depsHostHostPropagated = [ pkgsHostHost.stdenv.cc ]; | |||
There was a problem hiding this comment.
Something tells me this is the first depsHostHostPropagated 😂
10 tasks
|
I have bisected an issue with systemd's cross-compilation to this PR. Since 05d26ad, https://gist.github.com/da2b61d3f18656acf5a94a7f3193ceeb With the important bit being With that said, this may not be the PR that introduced the actual regression, but only the PR that made it fail in this particular exact way. The cause may be deeper, and introduced whenever the issue that caused #86229 was introduced (introduced in 9073a0c). Bisecting this does not look trivial. Any idea? The failure seems related to GNU EFI, as this allows the build to complete: diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 00a545ed3f5..7f9d9e7f3ad 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -141,7 +141,7 @@ in stdenv.mkDerivation {
"-Dsystem-gid-max=999"
# "-Dtime-epoch=1"
- (if !stdenv.hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true")
+ (if /*!stdenv.hostPlatform.isEfi*/ true then "-Dgnu-efi=false" else "-Dgnu-efi=true")
"-Defi-libdir=${toString gnu-efi}/lib"
"-Defi-includedir=${toString gnu-efi}/include/efi"
"-Defi-ldsdir=${toString gnu-efi}/lib"
|
|
/cc @Ericson2314 |
|
I've since fixed the issue in a239864. I wouldn't be surprised if it was still user the wrong |
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
Fixes #86229 and something that @matthewbauer noticed.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)