summary refs log tree commit diff
path: root/pkgs/applications/window-managers
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-05-09 13:58:08 +0200
committerVladimír Čunát <vcunat@gmail.com>2013-05-09 14:03:35 +0200
commitec3965d8d0b5594a9db11e6c9cd1c28d36e91cde (patch)
tree9bb0bc5ac4f3c6aaa170a9df5562f10e30ade47f /pkgs/applications/window-managers
parent84b0bf63b7f07dc1d9d19458dcbba6d02b4e2811 (diff)
downloadnixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar
nixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.gz
nixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.bz2
nixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.lz
nixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.xz
nixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.zst
nixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.zip
Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d3167b9f84bfab680d9c8c463adf64a60, reversing
changes made to 0c020c98f9d4f49d5c9907db5f4b35aac7df959b.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r--pkgs/applications/window-managers/weston/default.nix31
1 files changed, 0 insertions, 31 deletions
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
deleted file mode 100644
index 2c1044d6937..00000000000
--- a/pkgs/applications/window-managers/weston/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon
-, cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev
-, libjpeg, pam, autoconf, automake, libtool }:
-
-let version = "1.0.5"; in
-
-stdenv.mkDerivation rec {
-  name = "weston-${version}";
-
-  src = fetchurl {
-    url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "0g2k82pnlxl8b70ykazj7kn8xffjfsmgcgx427qdrm4083z2hgm0";
-  };
-
-  buildInputs = [ pkgconfig wayland mesa libxkbcommon
-    cairo libxcb libXcursor x11 udev libdrm mtdev
-    libjpeg pam autoconf automake libtool ];
-
-  preConfigure = "autoreconf -vfi";
-
-  # prevent install target to chown root weston-launch, which fails
-  configureFlags = ''
-    --disable-setuid-install
-  '';
-
-  meta = {
-    description = "Reference implementation of a Wayland compositor";
-    homepage = http://wayland.freedesktop.org/;
-    license = stdenv.lib.licenses.mit;
-  };
-}