Merge branch 'master' into x-updates

2013-09-07 16:19:46 +02:00
parent 0cf8a74e82 af96f91a12
commit b1be46e932
162 changed files with 5708 additions and 1601 deletions
--- a/pkgs/tools/graphics/jbig2enc/default.nix
+++ b/pkgs/tools/graphics/jbig2enc/default.nix
@@ -16,4 +16,10 @@
  preFixup = ''
    make clean
  '';
+
+  meta = {
+    description = "Encoder for the JBIG2 image compression format";
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.all;
+  };
 }