opencolorio2: Refactor dependencies

Python bindings and utility applications can now be disabled if desired.
GPU rendering is always enabled.

+27 -4
+24 -3
pkgs/development/libraries/opencolorio/default.nix
··· 1 - { stdenv, lib, fetchFromGitHub, cmake, expat, libyamlcpp, ilmbase, pystring, lcms2, python3Packages }: 2 3 with lib; 4 ··· 14 }; 15 16 nativeBuildInputs = [ cmake ]; 17 - buildInputs = [ expat libyamlcpp ilmbase pystring lcms2 python3Packages.pybind11 ]; 18 19 - cmakeFlags = [ "-DOCIO_INSTALL_EXT_PACKAGES=NONE" ]; 20 21 meta = with lib; { 22 homepage = "https://opencolorio.org";
··· 1 + { 2 + stdenv, lib, fetchFromGitHub, 3 + cmake, expat, libyamlcpp, ilmbase, pystring, # Base dependencies 4 + 5 + glew, freeglut, # Only required on Linux 6 + Carbon, GLUT, Cocoa, # Only required on Darwin 7 + 8 + pythonBindings ? true, # Python bindings 9 + python3Packages, 10 + 11 + buildApps ? true, # Utility applications 12 + lcms2, openimageio2, openexr, 13 + }: 14 15 with lib; 16 ··· 26 }; 27 28 nativeBuildInputs = [ cmake ]; 29 + buildInputs = [ expat libyamlcpp ilmbase pystring ] 30 + ++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ] 31 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon GLUT Cocoa ] 32 + ++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 ] 33 + ++ lib.optionals buildApps [ lcms2 openimageio2 openexr ]; 34 + 35 + cmakeFlags = [ "-DOCIO_INSTALL_EXT_PACKAGES=NONE" ] 36 + ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" 37 + ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; 38 39 + # TODO Investigate this: Python and GPU tests fail to load libOpenColorIO.so.2.0 40 + # doCheck = true; 41 42 meta = with lib; { 43 homepage = "https://opencolorio.org";
+3 -1
pkgs/top-level/all-packages.nix
··· 17514 openldap = callPackage ../development/libraries/openldap { }; 17515 17516 opencolorio1 = callPackage ../development/libraries/opencolorio/1.x.nix { }; 17517 - opencolorio2 = callPackage ../development/libraries/opencolorio { }; 17518 opencolorio = opencolorio1; 17519 17520 opendmarc = callPackage ../development/libraries/opendmarc { };
··· 17514 openldap = callPackage ../development/libraries/openldap { }; 17515 17516 opencolorio1 = callPackage ../development/libraries/opencolorio/1.x.nix { }; 17517 + opencolorio2 = callPackage ../development/libraries/opencolorio { 17518 + inherit (darwin.apple_sdk.frameworks) Carbon GLUT Cocoa; 17519 + }; 17520 opencolorio = opencolorio1; 17521 17522 opendmarc = callPackage ../development/libraries/opendmarc { };