Merge branch 'master' into x-updates

2012-07-18 23:24:10 -04:00
parent 0ef65a6bab d077a98e77
commit 4497344e49
59 changed files with 755 additions and 285 deletions
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm
    libstartup_notification libX11 pcre libev yajl flex libXcursor perl ];

+  patchPhase = "patchShebangs .";
+
  configurePhase = "makeFlags=PREFIX=$out";

  meta = {