libdatrie: depend on libiconv unconditionally #212758
Closed
SuperSandro2000 wants to merge 1 commit intoNixOS:stagingfrom
Closed
libdatrie: depend on libiconv unconditionally #212758SuperSandro2000 wants to merge 1 commit intoNixOS:stagingfrom
SuperSandro2000 wants to merge 1 commit intoNixOS:stagingfrom
Conversation
13 tasks
Member
|
It will be easier if we wait until the revert gets to |
Member
|
I also wasn't sure if the authors would instead prefer a quick fix on |
Member
|
As it is now, git resolves this as conflictless merge that doesn't change anything 😄 |
Member
|
I'd prefer this going to staging (thanks Sandro for making the PR!). It's not urgent. |
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.
e1dbae5 to
2c69985
Compare
Member
|
Rebased to pick up the revert. |
Member
|
Oh, race. I pushed 3d9ac1f directly. |
Member
Author
Yeah, I noticed that, too, while opening. I opened it as a to do for me to fix later. Should have marked it as draft tbh. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes