-
-
Notifications
You must be signed in to change notification settings - Fork 14.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
stdenv and base packages: fix with __structuredAttrs enabled #263773
base: staging
Are you sure you want to change the base?
Conversation
cf2b34a
to
49208af
Compare
f6d08f3
to
6bf9eb6
Compare
dc1b261
to
eea4b0b
Compare
@@ -54,14 +54,14 @@ stdenv.mkDerivation (finalAttrs: { | |||
# with LD_LIBRARY_PATH environment variable. | |||
(substituteAll { | |||
src = ./absolute_shlib_path.patch; | |||
inherit nixStoreDir; | |||
env = { inherit nixStoreDir; }; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You did a change in substitute-all.nix so this should be unnecessary now
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks missed that one while rebasing!
7de48e9
to
f94dca8
Compare
f94dca8
to
eb6b8b6
Compare
I think this is a good point, where I'll leave this PR and continue with follow-ups based on this:
Next steps will probably be around go/ruby language infrastructure and "leafier" packages. I've tried to make sure to not break anything with structuredAttrs kept off, although there are some larger changes, if any are controversial I can exclude them for now, to get this merged more easily. |
Found an issue with |
Description of changes
This fixes stdenv with
__structuredAttrs
enabled.Test build:
makeFlags
is a bash array and cannot be appended to as done in glibc'spreConfigure
.env
to be exportedThis is the first part of a number of PRs that intend to make nixpkgs forward-compatible with
__structuredAttrs
enabled globally.Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)