From 518e2f8fffc008e96b48507400899fcca9399576 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 25 Jul 2022 15:10:33 +0200 Subject: [PATCH] opencolorio: 2.0.2 -> 2.1.2 (#182695) Co-authored-by: Sandro --- .../libraries/opencolorio/default.nix | 58 ++++++++++++------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index a660008841a3..81ab688b6436 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -1,40 +1,56 @@ -{ - stdenv, lib, fetchFromGitHub, - cmake, expat, libyamlcpp, ilmbase, pystring, # Base dependencies - - glew, freeglut, # Only required on Linux - Carbon, GLUT, Cocoa, # Only required on Darwin - - pythonBindings ? true, # Python bindings - python3Packages, - - buildApps ? true, # Utility applications - lcms2, openimageio2, openexr, +{ stdenv +, lib +, fetchFromGitHub +, cmake +, expat +, libyamlcpp +, ilmbase +, pystring +, imath +# Only required on Linux +, glew +, freeglut +# Only required on Darwin +, Carbon +, GLUT +, Cocoa +# Python bindings +, pythonBindings ? true # Python bindings +, python3Packages +# Build apps +, buildApps ? true # Utility applications +, lcms2 +, openimageio2 +, openexr }: -with lib; - stdenv.mkDerivation rec { pname = "opencolorio"; - version = "2.0.2"; + version = "2.1.2"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenColorIO"; rev = "v${version}"; - sha256 = "sha256-Yr7yypXxf3ZvQVsDxVuKTN/DGPaLkIWli26RRoEDMdA="; + sha256 = "sha256-e1PpWjjfSjtgN9Rs/+lsA45Z9S4y4T6nqrJ02DZ4vjs="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ expat libyamlcpp ilmbase pystring ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ] + buildInputs = [ + expat + libyamlcpp + ilmbase + pystring + imath + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon GLUT Cocoa ] ++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 ] ++ lib.optionals buildApps [ lcms2 openimageio2 openexr ]; - cmakeFlags = [ "-DOCIO_INSTALL_EXT_PACKAGES=NONE" ] - ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" - ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; + cmakeFlags = [ + "-DOCIO_INSTALL_EXT_PACKAGES=NONE" + ] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" + ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; # TODO Investigate this: Python and GPU tests fail to load libOpenColorIO.so.2.0 # doCheck = true;