Skip to content

stdenv/freebsd: fixes from staging#415174

Merged
Ericson2314 merged 4 commits intoNixOS:staging-nextfrom
rhelmot:freebsd-stdenv-fetchurl
Jun 9, 2025
Merged

stdenv/freebsd: fixes from staging#415174
Ericson2314 merged 4 commits intoNixOS:staging-nextfrom
rhelmot:freebsd-stdenv-fetchurl

Conversation

@rhelmot
Copy link
Contributor

@rhelmot rhelmot commented Jun 9, 2025

Fallout from #410186
Fallout from #407315

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Jun 9, 2025
@rhelmot rhelmot requested a review from artemist June 9, 2025 02:45
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jun 9, 2025
@rhelmot rhelmot force-pushed the freebsd-stdenv-fetchurl branch from e74ceaf to ec7b23c Compare June 9, 2025 02:51
@github-project-automation github-project-automation bot moved this to In Progress in Stdenv Jun 9, 2025
@philiptaron
Copy link
Contributor

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
Copy link
Member

I noticed these problems when working on #414321 and #414573. You might want to merge master into staging-next to double check that I didn't cause any further breakage with those.

@Ericson2314 Ericson2314 merged commit 4ecb208 into NixOS:staging-next Jun 9, 2025
16 of 18 checks passed
@github-project-automation github-project-automation bot moved this from In Progress to Done in Stdenv Jun 9, 2025
@Ericson2314 Ericson2314 deleted the freebsd-stdenv-fetchurl branch June 9, 2025 16:33
@zowoq
Copy link
Contributor

zowoq commented Jun 27, 2025

I noticed these problems when working on #414321 and #414573. You might want to merge master into staging-next to double check that I didn't cause any further breakage with those.

libiconv seems to be broken on freebsd, looks like it may have been caused by #414573.

@zowoq
Copy link
Contributor

zowoq commented Dec 21, 2025

I noticed these problems when working on #414321 and #414573. You might want to merge master into staging-next to double check that I didn't cause any further breakage with those.

libiconv seems to be broken on freebsd, looks like it may have been caused by #414573.

@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.

@rhelmot
Copy link
Contributor Author

rhelmot commented Dec 21, 2025

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;
+        }
       );
     };
   })

@Ericson2314
Copy link
Member

Oh this is native compilation only infinite recursion?

@rhelmot
Copy link
Contributor Author

rhelmot commented Dec 21, 2025

Yes

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: stdenv Standard environment 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants