Skip to content

libdatrie: depend on libiconv unconditionally#212669

Merged
Ericson2314 merged 1 commit intoNixOS:masterfrom
alyssais:libdatrie-iconv
Jan 25, 2023
Merged

libdatrie: depend on libiconv unconditionally#212669
Ericson2314 merged 1 commit intoNixOS:masterfrom
alyssais:libdatrie-iconv

Conversation

@alyssais
Copy link
Member

@alyssais alyssais commented Jan 25, 2023

Description of changes

libiconv is already defined per-platform. The actual libiconv library won't be built on platforms like Linux where it doesn't need to be, so there's no need to maintain a separate platform list here.

Required to build for FreeBSD.

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.05 Release Notes (or backporting 22.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@alyssais
libdatrie: depend on libiconv unconditionally
8d2255d 
libiconv is already defined per-platform.  The actual libiconv library
won't be built on platforms like Linux where it doesn't need to be, so
there's no need to maintain a separate platform list here.

Required to build for FreeBSD.
@alyssais alyssais added the 6.topic: bsd Running or building packages on BSD label Jan 25, 2023
@alyssais alyssais requested a review from Ericson2314 January 25, 2023 21:24
@ofborg ofborg bot requested a review from SuperSandro2000 January 25, 2023 21:37
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package 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. labels Jan 25, 2023
@Ericson2314 Ericson2314 merged commit fd7e9aa into NixOS:master Jan 25, 2023
@vcunat
Copy link
Member

vcunat commented Jan 26, 2023

Why merging to master? This causes a huge rebuild on *-linux.

@vcunat vcunat mentioned this pull request Jan 26, 2023
Merged
@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Jan 26, 2023

#212758

@alyssais alyssais deleted the libdatrie-iconv branch January 26, 2023 18:17
vcunat pushed a commit that referenced this pull request Jan 26, 2023
@alyssais @vcunat
libdatrie: depend on libiconv unconditionally
3d9ac1f 
libiconv is already defined per-platform.  The actual libiconv library
won't be built on platforms like Linux where it doesn't need to be, so
there's no need to maintain a separate platform list here.

Required to build for FreeBSD.

Commit moved to staging branch from PR #212669 (commit 8d2255d).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

Assignees

No one assigned

Labels

6.topic: bsd Running or building packages on BSD 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@alyssais @vcunat @SuperSandro2000 @Ericson2314