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

cairo: pass --disable-xlib to config if no x11 #83808

Merged
merged 1 commit into from Apr 14, 2020
Merged

cairo: pass --disable-xlib to config if no x11 #83808

merged 1 commit into from Apr 14, 2020

Conversation

glittershark
Copy link
Member

@glittershark glittershark commented Mar 30, 2020 •
edited

It appears that cairo's configure script, at least on MacOS but perhaps
elsewhere, unconditionally enables xlib support, even if the library
isn't present, which breaks the build on MacOS always (since x11 is
disabled by default now). This explicitly passes --disable-x11 if
x11Support is set to false, which fixes the build for me.

Motivation for this change

Cairo fails to build by default on MacOS, and likely on other systems when x11Support is set to false

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@glittershark
cairo: pass --disable-xlib to config if no x11
84f720d 
It appears that cairo's configure script, at least on MacOS but perhaps
elsewhere, unconditionally enables xlib support, even if the library
isn't present, which breaks the build on MacOS always (since x11 is
disabled by default now). This explicitly passes `--disable-x11` if
x11Support is set to false, which fixes the build for me.
@grahamc
Copy link
Member

grahamc commented Mar 30, 2020

@GrahamcOfBorg eval

@worldofpeace worldofpeace changed the base branch from master to staging April 14, 2020 12:57
@worldofpeace worldofpeace merged commit 46bf4cb into NixOS:staging Apr 14, 2020
@glittershark glittershark deleted the fix-cairo-no-xlib branch April 14, 2020 14:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 0 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@glittershark @grahamc @matthewbauer @worldofpeace @Janik-Haag