From 79bfd749a0dcee5bb3e250ae11e296a7cdca407f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 19 Mar 2009 13:59:00 +0000
Subject: DataMatrix update

svn path=/nixpkgs/trunk/; revision=14607
---
 pkgs/tools/graphics/dmtx/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix      | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/graphics/dmtx/default.nix b/pkgs/tools/graphics/dmtx/default.nix
index 3457a0ab402..d6e7c0a4218 100644
--- a/pkgs/tools/graphics/dmtx/default.nix
+++ b/pkgs/tools/graphics/dmtx/default.nix
@@ -3,15 +3,16 @@ let
   lib = args.lib;
   fetchurl = args.fetchurl;
 
-  version = lib.getAttr ["version"] "0.5.2" args; 
+  version = lib.getAttr ["version"] "0.7.0" args; 
   buildInputs = with args; [
-    libpng libtiff
+    libpng libtiff libjpeg librsvg imagemagick pkgconfig
+    zlib libX11 bzip2
   ];
 in
 rec {
   src = fetchurl {
     url = "http://prdownloads.sourceforge.net/libdmtx/libdmtx-${version}.tar.bz2";
-    sha256 = "1xx61gykmq07m2vkqazns5whj8rv9nhwhjs6dakz9ai4qh7d53qz";
+    sha256 = "00w0pvpbwqqa1c8s85v8vf8w1x116yh7qg5fplxj5jhmfizcama2";
   };
 
   inherit buildInputs;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 80d80c8fb69..9ec5df0469b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7944,7 +7944,9 @@ let
   };
 
   dmtx = builderDefsPackage (import ../tools/graphics/dmtx) {
-    inherit libpng libtiff;
+    inherit libpng libtiff libjpeg imagemagick librsvg 
+      pkgconfig bzip2 zlib;
+    inherit (xlibs) libX11;
   };
 
   dvdauthor = import ../applications/video/dvdauthor {
-- 
cgit 1.4.1