Merge branch master into staging

2015-04-06 18:58:08 -07:00
parent 04e39bdb5c 812d8f9fa6
commit 6ec373d776
430 changed files with 8926 additions and 4887 deletions
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
    sha256 = "1jy6iqwwvd7drcybmdlmnc8m970f82fd7fisa8ha5zh13p49r8n2";
  };

-  buildInputs = [ cairo pkgconfig poppler.poppler_glib gtk ];
+  buildInputs = [ cairo pkgconfig poppler gtk ];

  meta = { 
    description = "PDF converter to SVG format";