Skip to content

freebsd.mkDerivation: re-add missing hunk#327815

Merged
Mic92 merged 1 commit intoNixOS:masterfrom
rhelmot:fix/freebsd
Jul 19, 2024
Merged

freebsd.mkDerivation: re-add missing hunk#327815
Mic92 merged 1 commit intoNixOS:masterfrom
rhelmot:fix/freebsd

Conversation

@rhelmot
Copy link
Contributor

@rhelmot rhelmot commented Jul 17, 2024

Description of changes

This hunk was originally added in #315176 and got lost when merging #320475. Without it, freebsd cross cannot build, failing with an infinite recursion error.

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (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.

@rhelmot rhelmot requested review from Ericson2314 and artemist July 17, 2024 05:18
@rhelmot rhelmot added the 6.topic: bsd Running or building packages on BSD label Jul 17, 2024
@ofborg ofborg 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 Jul 17, 2024
This was referenced Jul 17, 2024
@Mic92 Mic92 merged commit 96d0f7b into NixOS:master Jul 19, 2024
@Ericson2314 Ericson2314 deleted the fix/freebsd branch July 19, 2024 21:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: bsd Running or building packages on BSD 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

None yet

Development

Successfully merging this pull request may close these issues.

2 participants