Skip to content

gnutar: pull missing libintl dependency on Darwin#244996

Merged
vcunat merged 1 commit intoNixOS:stagingfrom
trofi:gnutar-fix-on-darwin-libintl
Jul 26, 2023
Merged

gnutar: pull missing libintl dependency on Darwin#244996
vcunat merged 1 commit intoNixOS:stagingfrom
trofi:gnutar-fix-on-darwin-libintl

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Jul 23, 2023

Without the change gnutar fails the build as:

  "_libintl_setlocale", referenced from:
      _main in tar.o
  "_libintl_textdomain", referenced from:
      _main in tar.o
ld: symbol(s) not found for architecture x86_64

https://hydra.nixos.org/build/228724258/nixlog/2/tail https://hydra.nixos.org/build/228711328/nixlog/2/tail

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.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.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jul 23, 2023
@trofi trofi mentioned this pull request Jul 23, 2023
12 tasks
@trofi
Copy link
Contributor Author

trofi commented Jul 23, 2023

There is a caveat: on staging darwin is a bit broken for #244400 (comment) . I tested on staging-23.0.5. Builds fine.

Without the change `gnutar` fails the build as:

      "_libintl_setlocale", referenced from:
          _main in tar.o
      "_libintl_textdomain", referenced from:
          _main in tar.o
    ld: symbol(s) not found for architecture x86_64

https://hydra.nixos.org/build/228724258/nixlog/2/tail
https://hydra.nixos.org/build/228711328/nixlog/2/tail
@trofi trofi force-pushed the gnutar-fix-on-darwin-libintl branch from 5e0cc4d to e37a0e0 Compare July 23, 2023 08:39
vcunat pushed a commit that referenced this pull request Jul 23, 2023
Without the change `gnutar` fails the build as:

      "_libintl_setlocale", referenced from:
          _main in tar.o
      "_libintl_textdomain", referenced from:
          _main in tar.o
    ld: symbol(s) not found for architecture x86_64

https://hydra.nixos.org/build/228724258/nixlog/2/tail
https://hydra.nixos.org/build/228711328/nixlog/2/tail

Picked from PR #244996
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 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: 0 This PR does not cause any packages to rebuild on Linux. labels Jul 23, 2023
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. And on staging-next-23.05 they now build fine for both *-darwin on Hydra.

@vcunat vcunat merged commit e788b98 into NixOS:staging Jul 26, 2023
@vcunat
Copy link
Member

vcunat commented Jul 26, 2023

Maybe it's all non-Linux, but there's little practical difference for us and I don't have a way of trying (which is closely related).

@trofi trofi deleted the gnutar-fix-on-darwin-libintl branch July 26, 2023 16:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin 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-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 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