-
-
Notifications
You must be signed in to change notification settings - Fork 14.8k
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
haskell-modules/generic-builder.nix: set NIX_LDFLAGS at the top level #266878
Conversation
73af674
to
4ce07de
Compare
env.NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; | ||
env = ( | ||
let | ||
args_env = args.env or { }; |
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.
args never has the env attribute at the moment so this makes little sense.
NIX_LDFLAGS
should be able to be set as a direct argument to stdenv.mkDerivation
and be propagated to the environment which would avoid this whole dance.
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.
I’ll revise and push an update when I have some bandwidth later today.
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.
I guess we can just leave it as is on staging-next
, the change I'd like would mean a mass rebuild I think.
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.
mass rebuilds are OK now. We have no binaries there (again).
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.
I’d wanted to rebuild Cachix to confirm rebuilds, but it’s taking a while to get there, so I fixed and force-pushed. I left it at the end since that keeps the diff small and lets it remain separated for the clang/libc++ case.
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.
From what I can tell, moving it up to the top level doesn’t appear to have caused rebuilds locally.
This is a follow-up PR to NixOS#266172 to address the feedback left by @sternenseemann regarding `env`. Rebuilds on staging-next NixOS#263535 should be limited if there are any.
4ce07de
to
b974b80
Compare
env
if set
Description of changes
This is a follow-up PR to #266172 to address the feedback left by @sternenseemann regarding
env
.Rebuilds on staging-next #263535 should be limited if there are any.
Also pinging @vcunat.
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/
)