Skip to content

Conversation

@0x4A6F
Copy link
Member

@0x4A6F 0x4A6F commented Apr 24, 2025

This reverts commit 58c2cb0.

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@0x4A6F 0x4A6F requested a review from emilazy April 24, 2025 10:54
@github-actions github-actions bot added 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Apr 24, 2025
@nix-owners nix-owners bot requested review from Conni2461, dasJ and helsinki-Jo April 24, 2025 11:07
@0x4A6F
Copy link
Member Author

0x4A6F commented Apr 24, 2025

That could also work:

commit cd2551186c4ad095b49bdb3a55a731557ad1ed96 (HEAD -> staging-gawk)
Author: 0x4A6F <0x4A6F@users.noreply.github.com>
Date:   Thu Apr 24 13:20:22 2025 +0200

    gawk: fix build on darwin

diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index f5647f303e12..c9cd7576b391 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -72,6 +72,10 @@ stdenv.mkDerivation rec {
     (if interactive then "--with-readline=${readline.dev}" else "--without-readline")
   ];

+  env = stdenv.hostPlatform.isDarwin {
+    NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
+  };
+
   makeFlags = [
     "AR=${stdenv.cc.targetPrefix}ar"
   ];

@0x4A6F 0x4A6F mentioned this pull request Apr 24, 2025
13 tasks
@0x4A6F 0x4A6F marked this pull request as draft April 24, 2025 20:19
@vcunat
Copy link
Member

vcunat commented Apr 25, 2025

Doesn't seem needed anymore. Both darwin stdenvs build now: https://hydra.nixos.org/eval/1814833

@vcunat vcunat closed this Apr 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants