ctl: Update to 1.5.2

4 files changed, 23 insertions, 58 deletions

diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix
index 65489ee8c88..4d30afe6818 100644
--- a/pkgs/development/libraries/ctl/default.nix
+++ b/pkgs/development/libraries/ctl/default.nix
@@ -1,29 +1,22 @@
-{ stdenv, fetchurl, ilmbase }:
+{ stdenv, callPackage, cmake, pkgconfig, ilmbase, libtiff, openexr }:
 
+let
+  source = callPackage ./source.nix { };
+in
 stdenv.mkDerivation {
-  name = "ctl-1.4.1";
+  name = "ctl-${source.version}";
 
-  src = fetchurl {
-    url = mirror://sourceforge/ampasctl/ctl-1.4.1.tar.gz;
-    sha256 = "16lzgbpxdyhykdwndj1i9vx3h4bfkxqqcrvasvgg70gb5raxj0mj";
-  };
-
-  patches = [ ./patch.patch ./gcc47.patch ];
-
-  propagatedBuildInputs = [ ilmbase ];
-
-  configureFlags = "--with-ilmbase-prefix=${ilmbase}";
+  src = source.src;
 
-  #configurePhase = "
-    #export CXXFLAGS=\"-I${ilmbase}/include -L${ilmbase}/lib\"
-    #echo $CXXFLAGS
-    #unset configurePhase; configurePhase
-  #";
+  buildInputs = [ cmake pkgconfig libtiff ilmbase openexr ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Color Transformation Language";
     homepage = http://ampasctl.sourceforge.net;
-    license = "SOME OPEN SOURCE LICENSE"; # TODO which exactly is this?
+    license = "A.M.P.A.S";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
   };
 
+  passthru.source = source;
 }
diff --git a/pkgs/development/libraries/ctl/gcc47.patch b/pkgs/development/libraries/ctl/gcc47.patch
deleted file mode 100644
index 1aa4be4fe6d..00000000000
--- a/pkgs/development/libraries/ctl/gcc47.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- https://bugs.gentoo.org/426368
- 
- IlmCtl/CtlInterpreter.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/IlmCtl/CtlInterpreter.cpp
-+++ b/IlmCtl/CtlInterpreter.cpp
-@@ -64,6 +64,7 @@
- #include <fstream>
- #include <algorithm>
- #include <cassert>
-+#include <unistd.h>
- 
- #ifdef WIN32
-     #include <io.h>
diff --git a/pkgs/development/libraries/ctl/patch.patch b/pkgs/development/libraries/ctl/patch.patch
deleted file mode 100644
index 1d441f58fcc..00000000000
--- a/pkgs/development/libraries/ctl/patch.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/IlmCtl/CtlLex.cpp b/IlmCtl/CtlLex.cpp
-index e662d22..a47311a 100644
---- a/IlmCtl/CtlLex.cpp
-+++ b/IlmCtl/CtlLex.cpp
-@@ -57,6 +57,7 @@
- #include <CtlLContext.h>
- #include <iomanip>
- #include <cassert>
-+#include <stdlib.h>
- 
- 
- #if 0
-diff --git a/IlmCtlSimd/CtlSimdReg.h b/IlmCtlSimd/CtlSimdReg.h
-index 6b000b2..8a39f7c 100644
---- a/IlmCtlSimd/CtlSimdReg.h
-+++ b/IlmCtlSimd/CtlSimdReg.h
-@@ -52,6 +52,7 @@
- #include <typeinfo>
- #include <CtlExc.h>
- #include <Iex.h>
-+#include <memory.h>
- 
- //-----------------------------------------------------------------------------
- //
diff --git a/pkgs/development/libraries/ctl/source.nix b/pkgs/development/libraries/ctl/source.nix
new file mode 100644
index 00000000000..d0cb83c0369
--- /dev/null
+++ b/pkgs/development/libraries/ctl/source.nix
@@ -0,0 +1,11 @@
+{ fetchFromGitHub }:
+rec {
+  version = "1.5.2";
+
+  src = fetchFromGitHub {
+    owner = "ampas";
+    repo = "CTL";
+    rev = "ctl-${version}";
+    sha256 = "0a698rd1cmixh3mk4r1xa6rjli8b8b7dbx89pb43xkgqxy67glwx";
+  };
+}