diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-09-23 14:44:21 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-09-23 14:44:21 -0700 |
| commit | d3f4ba9d6f2b284d8358e6136b4dfdcae4699992 (patch) | |
| tree | 589fd0c2e8625db456ad468f85d2d935d8c3fb97 /pkgs/applications/window-managers/weston | |
| parent | 3c8b92f4b35618e7c1db33e6878eb9526127406d (diff) | |
| parent | 5cfe893cc48cef16691facbb2bd01826e34afeaf (diff) | |
| download | nixlib-d3f4ba9d6f2b284d8358e6136b4dfdcae4699992.tar nixlib-d3f4ba9d6f2b284d8358e6136b4dfdcae4699992.tar.gz nixlib-d3f4ba9d6f2b284d8358e6136b4dfdcae4699992.tar.bz2 nixlib-d3f4ba9d6f2b284d8358e6136b4dfdcae4699992.tar.lz nixlib-d3f4ba9d6f2b284d8358e6136b4dfdcae4699992.tar.xz nixlib-d3f4ba9d6f2b284d8358e6136b4dfdcae4699992.tar.zst nixlib-d3f4ba9d6f2b284d8358e6136b4dfdcae4699992.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/applications/window-managers/weston')
| -rw-r--r-- | pkgs/applications/window-managers/weston/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 114b665225f8..862e8b0ea01e 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb -, libXcursor, x11, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput +, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , libwebp ? null, xwayland ? null # beware of null defaults, as the parameters *are* supplied by callPackage by default @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - wayland mesa libxkbcommon cairo libxcb libXcursor x11 udev libdrm mtdev - libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva libwebp + wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm + mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva + libwebp ]; configureFlags = [ |