Revert Merge x-updates into master due to mesa bloat

See #490 discussion. This reverts commit 1278859d31, reversing changes made to 0c020c98f9. Conflicts: pkgs/desktops/xfce/core/xfce4-session.nix (take master) pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
parent 84b0bf63b7
commit ec3965d8d0
135 changed files with 1595 additions and 2722 deletions
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
  };

  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb1 ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ;
+    ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus acl ] ;

  propagatedBuildInputs = [ openssl ];