treewide: makeWrapper buildInputs to nativeBuildInputs, makeWrapper: use proper shell when cross-compiling #112276
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
|
Even though I notice potentially many other incorrect placements of dependencies in |
siraben
force-pushed
the
makewrapper-native
branch
from
05bc857
to
6aa7bfc
Compare
ofborg
bot
added
6.topic: vim
6.topic: xfce
siraben
force-pushed
the
makewrapper-native
branch
from
a8b0136
to
6f38448
Compare
|
This is being done manually. Many of the packages that I moved |
ofborg
bot
added
6.topic: nixos
6.topic: python
6.topic: qt/kde
6.topic: rust
6.topic: stdenv
Reverting e899331 fixes eval. It seems to affect anything using This happens at the merge commit of this PR (c34b032), on the current tip of nixos-unstable (0aeba64), and at the tip of staging (d39fafe). Note that #114902 changes nothing to this issue. |
Ericson2314
added a commit
to obsidiansystems/nixpkgs
that referenced
this pull request
Mar 3, 2021
Fix NixOS#114952 Before it was using the wrong `makeWrapper`, the one that expected to run on the target platform and produce packages for the "super-target". The "super target" (sliding off the end of the platforms list) is defined to be the same as the target, to cap it with a loop so there is no sliding off. However, `targetPackages.targetPackages` is *not* similarly defined. Per the bottom of `pkgs/stdenv/booter.nix` it is an almost-empty package set that just exists as a hack to help some things with exotic `depsTargetTarget`. In particular, that rump "super `targetPackages`" does not contain a `runtimeShell`, and that's the source of our eval-time error.
Ericson2314
added a commit
that referenced
this pull request
Mar 4, 2021
buildPythonPackage: Fix after #112276
lilyball
reviewed
Mar 14, 2021
| buildInputs = [ makeWrapper ]; | ||
| nativeBuildInputs = [ makeWrapper ]; |
There was a problem hiding this comment.
This is a buildEnv (which doesn't support nativeBuildInputs). I can submit a PR to revert the change in this file, but I wonder if other packages were broken this way as well, and whether buildEnv should perhaps support nativeBuildInputs after all?
r-burns
pushed a commit
to r-burns/nixpkgs
that referenced
this pull request
Jun 8, 2021
Since NixOS#112276, we should always put `makeWrapper` in `nativeBuildInputs`. But `buildEnv` was saying put it in `buildInputs`. That's wrong! Fix the instructions, and make the right thing possible. (cherry picked from commit 4f6ec19)
r-burns
pushed a commit
to r-burns/nixpkgs
that referenced
this pull request
Jun 8, 2021
Now that `buildEnv` is ready, always put `makeWrapper` in `nativeBuildInputs`, rather than `buildInputs` or (worse) mucking around with setup hooks by hand. (C.f. NixOS#112276, which didn't catch these because the manual setup hook sourcing is such a hack to being with!) Fixes NixOS#114687 (cherry picked from commit 07ecf87)
Yarny0
added a commit
to Yarny0/nixpkgs
that referenced
this pull request
Jan 17, 2022
Although I'm not sure if `tsm-client` will ever be subject to cross-compiling, referencing makeWrapper from native BuildInputs is The Right Thing. This is a kind of follow-up of NixOS#112276
This pull request was closed.
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
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)