stdenv setup: Always use both propagated files #31775
Conversation
Ericson2314
force-pushed
the
stdenv-both-propagated-files
branch
from
3345513 to
f178da7
Compare
Ericson2314
added
6.topic: cross-compilation
GrahamcOfBorg
added
10.rebuild-darwin: 501+
10.rebuild-linux: 501+
10.rebuild-darwin-stdenv
|
@nixborg build |
|
Jobset created at https://hydra.mayflower.de/jobset/nixos/pr-31775 |
|
The custom Perl failure of Grub on linux is a non-deterministic bug in Perl's build system I've seen before. [I say "custom" because the main Perl job succeeded, and nothing but Grub was impacted by this failure, but I have no idea why Grub is requiring a bespoke Perl derivation.] That means this PR is correct (as far as we test), and only awaiting review. |
| local var="$2" | ||
| local propagatedBuildInputsFile="$3" | ||
| local pkg="$1"; shift | ||
| local var="$1"; shift |
There was a problem hiding this comment.
No, he shifts arguments to use $@ later.
| fi | ||
| } | ||
| envHooks+=(qtEnvHook) | ||
| if [ "$crossConfig" ]; then | ||
| crossEnvHooks+=(qtCrossEnvHook) |
pkgs/servers/x11/xorg/builder.sh
Outdated
| for p in "${pkgs[@]}"; do | ||
| if test -e $p/lib/pkgconfig/$r.pc; then | ||
| echo " found requisite $r in $p" | ||
| propagatedBuildInputs="$propagatedBuildInputs $p" |
There was a problem hiding this comment.
Take the opportunity to use +=.
There was a problem hiding this comment.
Heh yeah I did that in cross-elegant originally and just lost it in the backport. Good catch.
| crossEnvHooks+=(_grantleeCrossEnvHook) | ||
|
|
||
| _grantleeEnvHook() { | ||
| if providesGrantleeRuntime "$1"; then |
There was a problem hiding this comment.
Is it valid to use providesQtRuntime instead of providesGrantleeRuntime in the native case?
There was a problem hiding this comment.
Ooo I bet it should have been grantlee for both all along.
This continues NixOS#23374, which always kept around both attributes, by always including both propagated files: `propgated-native-build-inputs` and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still defined as before, however, so this change should only barely observable. This is an incremental step to fully keeping the dependencies separate in all cases.
Ericson2314
force-pushed
the
stdenv-both-propagated-files
branch
from
f178da7 to
da19c34
Compare
|
@nixborg build |
|
Jobset created at https://hydra.mayflower.de/jobset/nixos/pr-31775 |
|
Sounds sensible, I think. Would be nice to see a full hydra jobset built just in case some package is doing something weird. |
|
[There was nothing interesting left in the second nixborg eval's queue.] |
Motivation for this change
This continues #23374, which always kept around both attributes, by always including both propagated files:
propgated-native-build-inputsandpropagated-build-inputs.nativePkgsandcrossPkgsare still defined as before, however, so this change should only barely observable.This is an incremental step to fully keeping the dependencies separate in all cases, as is done in #26805 .
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)