about summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorRenaud <c0bw3b@users.noreply.github.com>2019-05-13 23:48:21 +0200
committerGitHub <noreply@github.com>2019-05-13 23:48:21 +0200
commit816fd81ffe45459862e73b9007111cd58fe559c4 (patch)
tree0ee2fcaff898fbb07d95d796c05264199bb29d63 /pkgs/development
parent3db7214ec424ceaf852ab09f0140c7a1747c074a (diff)
downloadnixlib-816fd81ffe45459862e73b9007111cd58fe559c4.tar
nixlib-816fd81ffe45459862e73b9007111cd58fe559c4.tar.gz
nixlib-816fd81ffe45459862e73b9007111cd58fe559c4.tar.bz2
nixlib-816fd81ffe45459862e73b9007111cd58fe559c4.tar.lz
nixlib-816fd81ffe45459862e73b9007111cd58fe559c4.tar.xz
nixlib-816fd81ffe45459862e73b9007111cd58fe559c4.tar.zst
nixlib-816fd81ffe45459862e73b9007111cd58fe559c4.zip
ctl: builds with ilmbase 2.3.x (#61468)
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/ctl/default.nix35
-rw-r--r--pkgs/development/libraries/ctl/source.nix11
2 files changed, 22 insertions, 24 deletions
diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix
index ac6c9657dde6..71e301044766 100644
--- a/pkgs/development/libraries/ctl/default.nix
+++ b/pkgs/development/libraries/ctl/default.nix
@@ -1,22 +1,31 @@
-{ stdenv, callPackage, cmake, pkgconfig, ilmbase, libtiff, openexr }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, ilmbase, libtiff, openexr }:
 
-let
-  source = callPackage ./source.nix { };
-in
-stdenv.mkDerivation {
-  name = "ctl-${source.version}";
+stdenv.mkDerivation rec {
+  pname = "ctl";
+  version = "1.5.2";
 
-  src = source.src;
+  src = fetchFromGitHub {
+    owner = "ampas";
+    repo = pname;
+    rev = "${pname}-${version}";
+    sha256 = "0a698rd1cmixh3mk4r1xa6rjli8b8b7dbx89pb43xkgqxy67glwx";
+  };
+
+  patches = [
+    (fetchpatch {
+      name = "ctl-1.5.2-ilm_230.patch";
+      url = "https://src.fedoraproject.org/rpms/CTL/raw/9d7c15a91bccdc0a9485d463bf2789be72e6b17d/f/ctl-1.5.2-ilm_230.patch";
+      sha256 = "0mdx7llwrm0q8ai53zhyxi40i9h5s339dbkqpqv30yzi2xpnfj3d";
+    })
+  ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake libtiff ilmbase openexr ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ libtiff ilmbase openexr ];
 
   meta = with stdenv.lib; {
     description = "Color Transformation Language";
-    homepage = http://ampasctl.sourceforge.net;
-    license = "A.M.P.A.S";
+    homepage = "https://github.com/ampas/CTL";
+    license = "A.M.P.A.S"; # BSD-derivative, free but GPL incompatible
     platforms = platforms.all;
   };
-
-  passthru.source = source;
 }
diff --git a/pkgs/development/libraries/ctl/source.nix b/pkgs/development/libraries/ctl/source.nix
deleted file mode 100644
index d0cb83c0369f..000000000000
--- a/pkgs/development/libraries/ctl/source.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ fetchFromGitHub }:
-rec {
-  version = "1.5.2";
-
-  src = fetchFromGitHub {
-    owner = "ampas";
-    repo = "CTL";
-    rev = "ctl-${version}";
-    sha256 = "0a698rd1cmixh3mk4r1xa6rjli8b8b7dbx89pb43xkgqxy67glwx";
-  };
-}