Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3db7214ec424
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 816fd81ffe45
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on May 13, 2019

  1. ctl: builds with ilmbase 2.3.x (#61468)

    @c0bw3b
    c0bw3b authored May 13, 2019
    Copy the full SHA
    816fd81 View commit details
Showing with 22 additions and 24 deletions.
  1. +22 −13 pkgs/development/libraries/ctl/default.nix
  2. +0 −11 pkgs/development/libraries/ctl/source.nix
35 changes: 22 additions & 13 deletions pkgs/development/libraries/ctl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
}
11 changes: 0 additions & 11 deletions pkgs/development/libraries/ctl/source.nix
View file

This file was deleted.