Merge remote-tracking branch 'origin/master' into stdenv-updates

2013-03-07 19:33:52 +01:00
parent da437144fa d742d26b0d
commit 674c51af3c
121 changed files with 1677 additions and 727 deletions
@@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
    sha256 = "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g";
  };

+  patches = [ ./gets-undeclared.patch ];
+
  nativeBuildInputs = [ pkgconfig gperf ];
+  
  buildInputs =
    [ zlib bzip2 lzo
      libgcrypt