Merge pull request #64236 from NixOS/staging-next

Staging next
2019-07-10 08:52:04 +02:00
parent d2c3c1f2bb 74c24385cb
commit fb6260fcf7
203 changed files with 5311 additions and 3760 deletions
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, wayland, libGL, mesa, libxkbcommon, cairo, libxcb
+{ stdenv, fetchurl, meson, ninja, pkgconfig
+, wayland, libGL, mesa, libxkbcommon, cairo, libxcb
 , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev
 , colord, lcms2
 , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null