Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 7802608649e3
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 8f1de2e7c091
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Aug 16, 2020

  1. cairo: make OpenGL support require X11 

    If OpenGL is enabled without X11, the build fails with:

In file included from /nix/store/<...>-libglvnd-1.3.1-dev/include/EGL/egl.h:39,
                 from cairo-gl.h:130,
                 from cairo-gl-private.h:51,
                 from cairo-gl-composite.c:48:
/nix/store/<...>-libglvnd-1.3.1-dev/include/EGL/eglplatform.h:128:10: fatal error: X11/Xlib.h: No such file or directory
  128 | #include <X11/Xlib.h>
      |          ^~~~~~~~~~~~
compilation terminated.
    @lopsided98 @alyssais
    lopsided98 authored and alyssais committed Aug 16, 2020
    Copy the full SHA
    98be04b View commit details
    Browse the repository at this point in the history

  2. environment.noXlibs: disable X11 support in cairo

    @lopsided98 @alyssais
    lopsided98 authored and alyssais committed Aug 16, 2020
    Copy the full SHA
    8f1de2e View commit details
    Browse the repository at this point in the history