From 8aa63b34dafb4de1ee60ab345a809814344f7fb0 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 17 Jun 2015 00:24:12 +0200
Subject: [PATCH] qrdecode: reimplement using mkDerivation

Also mark as broken; I have verified that the build fails with
the original build recipe.
---
 pkgs/tools/graphics/qrdecode/default.nix | 41 ++++++++----------------
 pkgs/top-level/all-packages.nix          |  2 +-
 2 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/pkgs/tools/graphics/qrdecode/default.nix b/pkgs/tools/graphics/qrdecode/default.nix
index f84780ab3c3..308183d7ae1 100644
--- a/pkgs/tools/graphics/qrdecode/default.nix
+++ b/pkgs/tools/graphics/qrdecode/default.nix
@@ -1,44 +1,29 @@
-args :  
-let 
-  lib = args.lib;
-  fetchurl = args.fetchurl;
-  fullDepEntry = args.fullDepEntry;
+{ stdenv, fetchurl, libpng, opencv }:
+
+stdenv.mkDerivation rec {
+  name = "libdecodeqr-${version}";
+  version = "0.9.3";
 
-  version = lib.attrByPath ["version"] "0.9.3" args; 
-  buildInputs = with args; [
-    libpng opencv
-  ];
-in
-rec {
   src = fetchurl {
     url = "mirror://debian/pool/main/libd/libdecodeqr/libdecodeqr_${version}.orig.tar.gz";
     sha256 = "1kmljwx69h7zq6zlp2j19bbpz11px45z1abw03acrxjyzz5f1f13";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
+  buildInputs = [ libpng opencv ];
 
-  /* doConfigure should be specified separately */
-  phaseNames = ["preConfigure" "doConfigure" "doMake" 
-  "createDirs"  "doMakeInstall" "postInstall"];
-
-  preConfigure = fullDepEntry ''
+  preConfigure = ''
     cd src
     sed -e /LDCONFIG/d -i libdecodeqr/Makefile.in
     sed -e '/#include <cv.h>/a#include <ml.h>' -i libdecodeqr/imagereader.h
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${args.opencv}/include/opencv"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${opencv}/include/opencv"
     export NIX_LDFLAGS="$NIX_LDFLAGS -lcxcore"
-  '' ["doUnpack"];
-  postInstall = fullDepEntry ''
-    cp sample/simple/simpletest $out/bin/qrdecode 
-    cd ..
-  '' ["doMake"];
-  createDirs = fullDepEntry ''
-    mkdir -p $out/bin $out/lib $out/include $out/share
-  '' ["defEnsureDir"];
+  '';
+
+  preInstall = "mkdir -p $out/bin $out/lib $out/include $out/share";
+  postInstall = "cp sample/simple/simpletest $out/bin/qrdecode";
 
-  name = "libdecodeqr-" + version;
   meta = {
     description = "QR code decoder library";
+    broken = true;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf920f7e64d..13995942797 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11908,7 +11908,7 @@ let
     java = if stdenv.isLinux then jre else jdk;
   };
 
-  qrdecode = builderDefsPackage (callPackage ../tools/graphics/qrdecode) {
+  qrdecode = callPackage ../tools/graphics/qrdecode {
     libpng = libpng12;
     opencv = opencv_2_1;
   };