Skip to content

fuse: fix build#421040

Merged
wegank merged 1 commit intoNixOS:stagingfrom
alyssais:fuse-gettext-0.25
Jul 1, 2025
Merged

fuse: fix build#421040
wegank merged 1 commit intoNixOS:stagingfrom
alyssais:fuse-gettext-0.25

Conversation

@alyssais
Copy link
Member

configure.ac uses the AM_ICONV macro, which is part of gettext. The patch makes autoreconf recognise the project as using gettext, which has the added benefit of meaning we no longer need to run makeconf.sh, and can rely on just the autoreconf from autoreconfHook.

Previously, we were actually doing autoreconf twice; once from the hook and once from the script, which I doubt was intentional…

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, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

configure.ac uses the AM_ICONV macro, which is part of gettext.  The
patch makes autoreconf recognise the project as using gettext, which
has the added benefit of meaning we no longer need to run makeconf.sh,
and can rely on just the autoreconf from autoreconfHook.

Previously, we were actually doing autoreconf twice; once from the
hook and once from the script, which I doubt was intentional…
@alyssais alyssais requested a review from wegank June 29, 2025 16:16
@alyssais alyssais mentioned this pull request Jun 29, 2025
13 tasks
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jun 29, 2025
@nix-owners nix-owners bot requested review from oxalica and primeos June 29, 2025 16:26
Copy link
Contributor

@trofi trofi left a comment

Choose a reason for hiding this comment

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

Fixes fuse2 build for me on x86_64-linux in staging branch. Thank you!

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jun 30, 2025
@wegank wegank merged commit eb7691d into NixOS:staging Jul 1, 2025
30 of 31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 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. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants