From 1401241864c48ebab0f3b8c2df446e0c3ba4a720 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 6 Jan 2012 23:05:11 +0000
Subject: [PATCH] qrencode-3.2.0

Remove builderDefs magic, add meta

Cherry-pick r31382 from branches/libpng15

svn path=/nixpkgs/trunk/; revision=31385
---
 pkgs/tools/graphics/qrencode/default.nix | 29 +++++++++---------------
 pkgs/top-level/all-packages.nix          |  4 +---
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix
index ae836ec086bb..866b121f76ba 100644
--- a/pkgs/tools/graphics/qrencode/default.nix
+++ b/pkgs/tools/graphics/qrencode/default.nix
@@ -1,27 +1,20 @@
-args :  
-let 
-  lib = args.lib;
-  fetchurl = args.fetchurl;
+{ stdenv, fetchurl, libpng, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "qrencode-3.2.0";
 
-  version = lib.attrByPath ["version"] "3.0.3" args; 
-  buildInputs = with args; [
-    libpng pkgconfig
-  ];
-in
-rec {
   src = fetchurl {
-    url = "http://megaui.net/fukuchi/works/qrencode/qrencode-${version}.tar.gz";
-    sha256 = "1f5nnbk016casqfprdli50ssv08l0gj5zrd0q4rdvzfwqy67i7vm";
+    url = "${meta.homepage}/${name}.tar.bz2";
+    sha256 = "13q6cz2lif8d7y95f8sgfqaxc1qr0sz9nl2xh71lfmx7v5ybri03";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
+  buildInputs = [ libpng ];
+  buildNativeInputs = [ pkgconfig ];
 
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  name = "qrencode-" + version;
   meta = {
+    homepage = http://fukuchi.org/works/qrencode/;
     description = "QR code encoder";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 036aef96040b..e2da9fe27dfd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6859,9 +6859,7 @@ let
     opencv = opencv_2_1;
   };
 
-  qrencode = builderDefsPackage (import ../tools/graphics/qrencode) {
-    inherit libpng pkgconfig;
-  };
+  qrencode = callPackage ../tools/graphics/qrencode { };
 
   gecko_mediaplayer = callPackage ../applications/networking/browsers/mozilla-plugins/gecko-mediaplayer {
     inherit (gnome) GConf;