From 63d096bc46dc8664f26c5277f46458f68bf453b8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 15 Aug 2013 09:23:00 -0400
Subject: [PATCH] libjson: Update to 7.6.1

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/libraries/libjson/default.nix    | 15 +++++++++------
 .../libraries/libjson/install-fix.patch           | 12 ++++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/libjson/install-fix.patch

diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix
index f49c885c066b..a22ae64dfde5 100644
--- a/pkgs/development/libraries/libjson/default.nix
+++ b/pkgs/development/libraries/libjson/default.nix
@@ -1,13 +1,16 @@
 { stdenv, fetchurl, unzip }:
-
-stdenv.mkDerivation rec {
-  name = "libjson-7.4.0";
+let
+  version = "7.6.1";
+in stdenv.mkDerivation rec {
+  name = "libjson-${version}";
   src = fetchurl {
-    url = "mirror://sourceforge/libjson/libjson_7.4.0.zip";
-    sha256 = "0rd6m3r3acm7xq6f0mbyyhc3dnwmiga60cws29yjl6nx2f9h3r0x";
+    url = "mirror://sourceforge/libjson/libjson_${version}.zip";
+    sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7";
   };
+  patches = [ ./install-fix.patch ];
   buildInputs = [ unzip ];
-  makeFlags = "prefix=$out";
+  makeFlags = [ "prefix=$(out)" ];
+  preInstall = "mkdir -p $out/lib";
   meta = {
     homepage = "http://libjson.sourceforge.net/";
     description = "A JSON reader and writer";
diff --git a/pkgs/development/libraries/libjson/install-fix.patch b/pkgs/development/libraries/libjson/install-fix.patch
new file mode 100644
index 000000000000..f074c8ba3aa5
--- /dev/null
+++ b/pkgs/development/libraries/libjson/install-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur libjson-orig/makefile libjson/makefile
+--- libjson-orig/makefile	2012-05-30 05:15:42.000000000 -0400
++++ libjson/makefile	2013-08-15 09:17:41.154245534 -0400
+@@ -266,7 +266,7 @@
+ 	cp -r ./$(srcdir)/JSONDefs $(include_path)/$(libname_hdr)/$(srcdir)
+ 	chmod -R a+r $(include_path)/$(libname_hdr)
+ 	find  $(include_path)/$(libname_hdr) -type d -exec chmod a+x {} \;
+-	cp -rv $(srcdir)/Dependencies/ $(include_path)/$(libname_hdr)/$(srcdir)
++	cp -rv $(srcdir)/../Dependencies/ $(include_path)/$(libname_hdr)/$(srcdir)/..
+ 	@echo "Install header files: Done."
+ 
+ clean: banner