Merge remote-tracking branch 'upstream/x-updates' into wayland

Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/wayland/default.nix
2013-02-18 20:15:59 +01:00
parent bd8428efa1 bcbf9472ea
commit d32a973fc9
472 changed files with 16370 additions and 6035 deletions
@@ -9,6 +9,10 @@ cabal.mkDerivation (self: {
  buildDepends = [
    extensibleExceptions filepath mtl utf8String X11
  ];
+  postInstall = ''
+    mkdir -p $out/share/man/man1
+    mv $out/share/xmonad-*/man/*.1 $out/share/man/man1/
+  '';
  meta = {
    homepage = "http://xmonad.org";
    description = "A tiling window manager";