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

w3m-nox: fix build #62041

Merged
merged 1 commit into from May 25, 2019
Merged

w3m-nox: fix build #62041

merged 1 commit into from May 25, 2019

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented May 25, 2019 •
edited

Motivation for this change

In the latest version (0.5.3+git20190105), <X11/xlib.h> isn't directly
included in fb_imlib2.c anymore, however it's used by <Imlib.h>
which broke our patch which disables X11 here.

Hydra build failure: https://hydra.nixos.org/build/93730733
See also tats/w3m@2266d1b

Things done
  • 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 nix-review --run "nix-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.

@Ma27
w3m-nox: fix build
3cad8fb 
In the latest version (0.5.3+git20190105), `<X11/xlib.h>` isn't directly
included in `fb_imlib2.c` anymore, however it's used by `<Imlib.h>`
which broke our patch which disables X11 here.

Hydra build failure: https://hydra.nixos.org/build/93730733
See also tats/w3m@2266d1b
JohnAZoidberg
JohnAZoidberg approved these changes May 25, 2019
View reviewed changes
Copy link
Member

@JohnAZoidberg JohnAZoidberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That fixes it!

@c0bw3b c0bw3b merged commit 6f19a3c into NixOS:master May 25, 2019
@Ma27 Ma27 deleted the fix-w3m-nox branch May 26, 2019 07:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JohnAZoidberg JohnAZoidberg JohnAZoidberg approved these changes

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.

None yet
3 participants
@Ma27 @JohnAZoidberg @c0bw3b