openexr: 1.7.1 -> 2.2.0

3 files changed, 37 insertions, 38 deletions

diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index b54375ae062..fcb27c2c0cc 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -1,18 +1,31 @@
-{ stdenv, fetchurl, pkgconfig, zlib, ctl, ilmbase }:
-
+{ stdenv, callPackage, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }:
+let
+  source = callPackage ./source.nix { };
+in
 stdenv.mkDerivation rec {
-  name = "openexr-1.7.1";
-  
-  src = fetchurl {
-    url = "mirror://savannah/openexr/${name}.tar.gz";
-    sha256 = "0l2rdbx9lg4qk2ms98hwbsnzpggdrx3pbjl6pcvrrpjqp5m905n6";
-  };
+  name = "openexr-${source.version}";
   
-  buildInputs = [ pkgconfig ctl ];
-  
-  propagatedBuildInputs = [ zlib ilmbase ];
+  src = source.src;
+
+  prePatch = ''
+    cd OpenEXR
+  '';
+
+  preConfigure = ''
+    ./bootstrap
+  '';
+
+  configureFlags = [ "--enable-imfexamples" ];
   
-  configureFlags = "--enable-imfexamples";
+  buildInputs = [ autoconf automake libtool pkgconfig ];
+  propagatedBuildInputs = [ ilmbase zlib ];
   
-  patches = [ ./stringh.patch ];
+  meta = with stdenv.lib; {
+    homepage = http://www.openexr.com/;
+    license = licenses.bsd3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
+  };
+
+  passthru.source = source;
 }
diff --git a/pkgs/development/libraries/openexr/source.nix b/pkgs/development/libraries/openexr/source.nix
new file mode 100644
index 00000000000..30675dc54ec
--- /dev/null
+++ b/pkgs/development/libraries/openexr/source.nix
@@ -0,0 +1,11 @@
+{ fetchFromGitHub }:
+rec {
+  version = "2.2.0";
+
+  src = fetchFromGitHub {
+    owner = "openexr";
+    repo = "openexr";
+    rev = "v${version}";
+    sha256 = "030vj2jk3n65x1wl0rmxzpl1bd5mzmld2lzn7sg92svpnghry6a8";
+  };
+}
diff --git a/pkgs/development/libraries/openexr/stringh.patch b/pkgs/development/libraries/openexr/stringh.patch
deleted file mode 100644
index ef8cf06b24a..00000000000
--- a/pkgs/development/libraries/openexr/stringh.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/exrenvmap/main.cpp b/exrenvmap/main.cpp
-index c5afcc5..5e993b3 100644
---- a/exrenvmap/main.cpp
-+++ b/exrenvmap/main.cpp
-@@ -45,6 +45,7 @@
- #include <iostream>
- #include <exception>
- #include <stdlib.h>
-+#include <string.h>
- 
- using namespace Imf;
- using namespace std;
-diff --git a/exrmaketiled/main.cpp b/exrmaketiled/main.cpp
-index 5ce4e95..f93ec08 100644
---- a/exrmaketiled/main.cpp
-+++ b/exrmaketiled/main.cpp
-@@ -44,7 +44,7 @@
- 
- #include <iostream>
- #include <exception>
--#include <string>
-+#include <string.h>
- #include <stdlib.h>
- 
- using namespace Imf;