public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III
2015-09-23 14:44:21 -07:00
parent 3c8b92f4b3 5cfe893cc4
commit d3f4ba9d6f
351 changed files with 12549 additions and 1699 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/window-managers/weston/default.nix
+4 -3
View File
@@ -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 = [