Skip to content

docbook2x: allow configure to find osx#416216

Merged
ttuegel merged 1 commit intoNixOS:stagingfrom
mildsunrise:patch-2
Jun 18, 2025
Merged

docbook2x: allow configure to find osx#416216
ttuegel merged 1 commit intoNixOS:stagingfrom
mildsunrise:patch-2

Conversation

@mildsunrise
Copy link
Copy Markdown
Contributor

Fixes #412735.

#358347 / #400315 left the package broken because configure searches for osx in PATH and hardcodes its path on the Perl code. strictDeps logically prevents the dependency from being in PATH, so an empty string is hardcoded and sgml2xml-isoent doesn't work.

The best fix that comes to mind is overriding the autoconf test result via the environment variable.

I believe this is a more proper fix than #412736 (which would break cross).

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.

Fixes NixOS#412735.

NixOS#358347 / NixOS#400315 left the package broken because configure searces for osx in PATH and hardcodes its path on the Perl code. strictDeps logically prevents the dependency from being in PATH, so an empty string is hardcoded and `sgml2xml-isoent` doesn't work.

The best fix that comes to mind is overriding the autoconf test result via the environment variable.
@github-actions github-actions bot added 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. labels Jun 12, 2025
Copy link
Copy Markdown
Member

@ttuegel ttuegel left a comment

Choose a reason for hiding this comment

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

I tested this out locally and it looks good to me!

@ttuegel ttuegel merged commit a08787a into NixOS:staging Jun 18, 2025
17 of 18 checks passed
@mildsunrise mildsunrise deleted the patch-2 branch June 18, 2025 17:08
@mildsunrise mildsunrise mentioned this pull request Jun 28, 2025
13 tasks
@laMudri laMudri mentioned this pull request Jul 9, 2025
3 tasks
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