stdenv/freebsd: fixes from staging#415174
Conversation
e74ceaf to
ec7b23c
Compare
|
I'm looking for you to self-merge, Audrey (@rhelmot) -- the diff makes perfect sense to me, but I don't have a FreeBSD VM with the nascent NixBSD available to test. |
@Ericson2314 Could I bother you to take a look at this please, I'm not really sure what to do with it besides just reverting your change for freebsd. |
|
Can you please test this diff? I've found it fixes the infinite recursion but I don't know if it has other knock-on effects (for example, introducing dependencies in the final stdenv on the bootstrap tools) diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index db991403ece0..6f19db02f373 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -589,7 +589,10 @@ in
__bootstrapArchive = bootstrapArchive;
fetchurl = prevStage.fetchurlReal;
freebsd = super.freebsd.overrideScope (
- self': super': { localesPrev = prevStage.freebsd.localesReal; }
+ self': super': {
+ localesPrev = prevStage.freebsd.localesReal;
+ libc = prevStage.freebsd.libc;
+ }
);
};
}) |
|
Oh this is native compilation only infinite recursion? |
|
Yes |
Fallout from #410186
Fallout from #407315
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.