diff options
author | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:53:10 -0800 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:53:10 -0800 |
commit | 9579c9ec7f53be31efba3803bd86661b59b0bb81 (patch) | |
tree | e9e9ec19c0989f18d96ec0b8c6faf3780eb3dfb1 /pkgs/applications/window-managers | |
parent | 83aeb00a78ebca04bd6a42721284cad87da9fabe (diff) | |
parent | cb21b77ff1b9ed006d1180ad7c94b2ee7ed3c096 (diff) | |
download | nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.gz nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.bz2 nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.lz nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.xz nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.zst nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.zip |
Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
Diffstat (limited to 'pkgs/applications/window-managers')
-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 7a662aaf09e..862e8b0ea01 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -7,15 +7,16 @@ stdenv.mkDerivation rec { name = "weston-${version}"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "04nkbbdglh0pqznxkdqvak3pc53jmz24d0658bn5r0cf6agycqw9"; + sha256 = "1ks8mja6glzy2dkayi535hd6w5c5h021bqk7vzgv182g33rh66ww"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm + wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva libwebp ]; |