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.

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

texinfo: Depend on gettext on Darwin #97289

Merged
merged 2 commits into from Oct 6, 2020
Merged

texinfo: Depend on gettext on Darwin #97289

merged 2 commits into from Oct 6, 2020

Conversation

@kampka
Copy link
Contributor

@kampka kampka commented Sep 6, 2020

texinfo version 6.7 requires libintl.h which on Linux is provided
by the libc. On Darwin, this lib should be provided by gettext instead.

@NixOS/darwin-maintainers I cannot test this myself, can one of you please verify this PR? Thanks!

If this tests well we should be able to revert b23940e

@kampka
Copy link
Contributor Author

@kampka kampka commented Sep 6, 2020

@thefloweringash
Copy link
Member

@thefloweringash thefloweringash commented Sep 7, 2020

This is sufficient to build a stdenv on Darwin. Note that it requires reverting fb777be, which is already reverted in staging (e560459).

@FRidh
Copy link
Member

@FRidh FRidh commented Sep 7, 2020

staging-next has a ugly work-around which effectively reverts that commit.

@FRidh FRidh self-assigned this Sep 7, 2020
@FRidh
Copy link
Member

@FRidh FRidh commented Sep 7, 2020

@pbogdan could you take on the role of CI once more? 😄

@FRidh
Copy link
Member

@FRidh FRidh commented Sep 7, 2020

@kampka should the revert be added to this PR?

kampka added 2 commits Sep 7, 2020
texinfo version 6.7 requires libintl.h which on Linux is provided
by the libc. On Darwin, this lib is provided by gettext instead.
@kampka
Copy link
Contributor Author

@kampka kampka commented Sep 7, 2020

@FRidh imo it would make sense. Added the revert commit to the PR.

@pbogdan
Copy link
Member

@pbogdan pbogdan commented Sep 7, 2020

LGTM, I had a texinfo 6.7 + gettext change in a local tree (along with the build artifacts), double checked and nix-build -A stdenv and nix-build -A texinfo succeed on this branch.

Just let me know if there are any further changes to test.

@ofborg ofborg bot requested review from andir, edolstra and np Sep 7, 2020
@FRidh FRidh merged commit 578b2b9 into NixOS:staging Oct 6, 2020
19 checks passed
Staging automation moved this from WIP to Done Oct 6, 2020
@jonringer
Copy link
Contributor

@jonringer jonringer commented Oct 8, 2020

allegro was still using the 6.5, now nixpkgs is broken on staging:

error: while evaluating 'callPackageWith' at /home/jon/.cache/nixpkgs-review/pr-99983-1/nixpkgs/lib/customisation.nix:117:35, called from /home/jon/.cache/nixpkgs-review/pr-99983-1/nixpkgs/pkgs/top-level/all-packages.nix:11862:14:
while evaluating 'makeOverridable' at /home/jon/.cache/nixpkgs-review/pr-99983-1/nixpkgs/lib/customisation.nix:67:24, called from /home/jon/.cache/nixpkgs-review/pr-99983-1/nixpkgs/lib/customisation.nix:121:8:
anonymous function at /home/jon/.cache/nixpkgs-review/pr-99983-1/nixpkgs/pkgs/development/libraries/allegro/default.nix:1:1 called without required argument 'texinfo6_5', at /home/jon/.cache/nixpkgs-review/pr-99983-1/nixpkgs/lib/customisation.nix:69:16

if this is in staging-next, then it will have broken hydra

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Staging
  
Done
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants