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

Jump to bottom

apvlv: fix build with poppler 0.73.0 #55380

Merged
merged 1 commit into from Feb 7, 2019
Merged

apvlv: fix build with poppler 0.73.0 #55380

merged 1 commit into from Feb 7, 2019

Conversation

erictapen
Copy link
Member

Motivation for this change

closes #54021

Things done

Took @worldofpeace's commit and provided some more info in the commit message.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@worldofpeace @erictapen
apvlv: fix build with poppler 0.73.0
0d3bb2e 
Poppler was upgraded in [0] and therefore the build broke, as
poppler/goo/gtypes.h was moved into poppler/goo/gfile.h [1].

Upstream issue is [2].

[0] NixOS@7757e43
[1] https://gitlab.freedesktop.org/poppler/poppler/commit/ef3ef702bc3dc845731e43215400448c5324efd4
[2] naihe2010/apvlv#28
@timokau
Copy link
Member

timokau commented Feb 7, 2019

Is there an upstream report about this?

@erictapen
Copy link
Member Author

@timokau Yep, I noted it in the commit message, but not in the text of the PR.

naihe2010/apvlv#28

@timokau
Copy link
Member

timokau commented Feb 7, 2019

Great :)

Though @worldofpeace said "That patch was mean't to be used in nixpkgs", so I'll defer to them.

@worldofpeace
Copy link
Contributor

Upstream they should properly condition which header is used by the poppler version used in the build environment.

Though this patch is completely fine to have in nixpkgs.

@worldofpeace worldofpeace merged commit 59f6083 into NixOS:master Feb 7, 2019
@worldofpeace
Copy link
Contributor

Thanks @erictapen for following up on this ❇️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

building apvlv on nixos-unstable fails
4 participants
@erictapen @timokau @worldofpeace @GrahamcOfBorg