Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

xdg-user-dirs: make sure libiconv is linked #346970

Merged
merged 1 commit into from
Oct 11, 2024
Merged

xdg-user-dirs: make sure libiconv is linked #346970

merged 1 commit into from
Oct 11, 2024

Conversation

reckenrode
Copy link
Contributor

Because the Darwin SDK automatically propagates libiconv after #346043, it is no longer linked automatically (because that would link libiconv to everything whether it wanted it or not).

xdg-user-dirs is failing to link not because it assumes libiconv comes with libc but because of a bug in its build system. The configure script detects how to link libiconv, but Makefile.am does not make use of that to link libiconv when it is needed.

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.

@reckenrode reckenrode mentioned this pull request Oct 7, 2024
Merged
52 tasks
@reckenrode reckenrode marked this pull request as draft October 7, 2024 00:44
@reckenrode reckenrode changed the base branch from reckenrode/darwin-sdk-refactor to master October 7, 2024 00:45
@github-actions github-actions bot added 6.topic: python 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: qt/kde 6.topic: kernel The Linux kernel 8.has: documentation This PR adds or changes documentation 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: emacs Text editor 6.topic: printing 6.topic: rust 6.topic: golang 6.topic: ruby 6.topic: vim 6.topic: ocaml 6.topic: xfce The Xfce Desktop Environment 6.topic: stdenv Standard environment 6.topic: nodejs 6.topic: systemd 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: dotnet Language: .NET labels Oct 7, 2024
@github-actions github-actions bot removed 6.topic: python 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: qt/kde 6.topic: kernel The Linux kernel 8.has: documentation This PR adds or changes documentation 8.has: changelog labels Oct 7, 2024
@github-actions github-actions bot removed 6.topic: vscode 6.topic: lib The Nixpkgs function library 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` labels Oct 7, 2024
@ofborg ofborg bot requested a review from donovanglover October 7, 2024 01:54
@reckenrode reckenrode force-pushed the reckenrode/darwin-sdk-refactor branch from ee7fb7e to 183877a Compare October 7, 2024 03:49
@reckenrode reckenrode force-pushed the reckenrode/darwin-sdk-refactor branch from 183877a to 1fd30e4 Compare October 8, 2024 02:51
@reckenrode reckenrode force-pushed the push-urnzqozlykmm branch 2 times, most recently from 93a3ff4 to b3ccf78 Compare October 8, 2024 03:29
@reckenrode reckenrode deleted the branch NixOS:staging October 8, 2024 03:30
@reckenrode reckenrode closed this Oct 8, 2024
@reckenrode reckenrode reopened this Oct 8, 2024
@reckenrode reckenrode force-pushed the reckenrode/darwin-sdk-refactor branch 2 times, most recently from a240201 to 4112f1a Compare October 9, 2024 02:16
@reckenrode
xdg-user-dirs: make sure libiconv is linked
ff25858 
Because the Darwin SDK automatically propagates libiconv, it is no
longer linked automatically (because that would link libiconv to
everything whether it wanted it or not).

xdg-user-dirs is failing to link not because it assumes libiconv comes
with libc but because of a bug in its build system. The `configure`
script detects how to link libiconv, but `Makefile.am` does not make use
of that to link libiconv when it is needed.
@reckenrode reckenrode force-pushed the reckenrode/darwin-sdk-refactor branch 2 times, most recently from a1adff0 to e3f2829 Compare October 10, 2024 20:25
@emilazy emilazy marked this pull request as ready for review October 10, 2024 22:54
@emilazy emilazy deleted the branch NixOS:staging October 11, 2024 00:00
@emilazy emilazy closed this Oct 11, 2024
@reckenrode reckenrode reopened this Oct 11, 2024
@reckenrode reckenrode changed the base branch from reckenrode/darwin-sdk-refactor to staging October 11, 2024 00:04
@emilazy emilazy merged commit 5291b40 into NixOS:staging Oct 11, 2024
42 of 44 checks passed
@reckenrode reckenrode deleted the push-urnzqozlykmm branch October 11, 2024 13:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilazy emilazy emilazy approved these changes

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@donovanglover donovanglover Awaiting requested review from donovanglover

Assignees
No one assigned
Labels
10.rebuild-darwin: 101-500 10.rebuild-linux: 501-1000 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@reckenrode @SuperSandro2000 @emilazy