From ef084be97b99dd0790912d5dd54891102c85d1f4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 30 Mar 2012 01:36:38 +0000
Subject: [PATCH] Add libicns

svn path=/nixpkgs/trunk/; revision=33481
---
 pkgs/development/libraries/libicns/default.nix  | 12 ++++++++++++
 pkgs/development/libraries/openjpeg/default.nix | 14 +++-----------
 pkgs/top-level/all-packages.nix                 |  2 ++
 3 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/libraries/libicns/default.nix

diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix
new file mode 100644
index 000000000000..5cdb21d8491d
--- /dev/null
+++ b/pkgs/development/libraries/libicns/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, libpng, openjpeg }:
+
+stdenv.mkDerivation {
+  name = "libicns-0.8.0";
+
+  src = fetchurl {
+    url = mirror://sourceforge/icns/libicns-0.8.0.tar.gz;
+    sha256 = "0jh67nm07jr1nfkfjid3jjw7fyw5hvj6a2fqan1bhg6gyr2hswla";
+  };
+
+  buildInputs = [ libpng openjpeg ];
+}
diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix
index f4c6d7367f62..575d580faf65 100644
--- a/pkgs/development/libraries/openjpeg/default.nix
+++ b/pkgs/development/libraries/openjpeg/default.nix
@@ -1,21 +1,13 @@
 { stdenv, fetchurl }: 
 
 stdenv.mkDerivation {
-  name = "openjpeg-1.2";
+  name = "openjpeg-1.5.0";
   
   src = fetchurl {
-    url = http://www.openjpeg.org/openjpeg_v1_2.tar.gz;
-    sha256 = "1i72i0hhssgg6vfkaw3gpwf5ld65g9s77ay8pxd4any1xy54qa90";
+    url = http://openjpeg.googlecode.com/files/openjpeg-1.5.0.tar.gz;
+    sha256 = "1kja6s9dk0hh7p9064kg69y6vninwyvpqi8cap92waj38jmqz469";
   };
 
-  patchPhase = ''
-    sed -i -e 's/-o root -g [^ ]\+//' Makefile Makefile.osx
-  '';
-
-  preInstall = ''
-    export installFlags="PREFIX=$out"
-  '';
-  
   meta = {
     homepage = http://www.openjpeg.org/;
     description = "Open-source JPEG 2000 codec written in C language";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3983f0ac9ca..8cd599ef999b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4035,6 +4035,8 @@ let
 
   libical = callPackage ../development/libraries/libical { };
 
+  libicns = callPackage ../development/libraries/libicns { };
+
   libimobiledevice = callPackage ../development/libraries/libimobiledevice { };
 
   libiodbc = callPackage ../development/libraries/libiodbc {