diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index ea942a8ec9f6..4a3dff0fe3e5 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -59,7 +59,7 @@ opencolorio, openexr, openimagedenoise, - openimageio, + openimageio_2, openjpeg, openpgl, opensubdiv, @@ -251,7 +251,7 @@ stdenv'.mkDerivation (finalAttrs: { libwebp opencolorio openexr - openimageio + openimageio_2 openjpeg openpgl (opensubdiv.override { inherit cudaSupport; }) diff --git a/pkgs/by-name/gp/gpupad/package.nix b/pkgs/by-name/gp/gpupad/package.nix index 7b076839a3d5..d9b87cdc3a47 100644 --- a/pkgs/by-name/gp/gpupad/package.nix +++ b/pkgs/by-name/gp/gpupad/package.nix @@ -7,7 +7,7 @@ glslang, imath, ktx-tools, - openimageio, + openimageio_2, qt6Packages, spdlog, spirv-cross, @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { glslang imath # needed for openimageio ktx-tools - openimageio + openimageio_2 qt6Packages.qtbase qt6Packages.qtdeclarative qt6Packages.qtmultimedia diff --git a/pkgs/by-name/op/openimageio/2.nix b/pkgs/by-name/op/openimageio/2.nix new file mode 100644 index 000000000000..d31dd2190a51 --- /dev/null +++ b/pkgs/by-name/op/openimageio/2.nix @@ -0,0 +1,15 @@ +{ fetchFromGitHub, openimageio }: + +let + version = "2.5.17.0"; +in +openimageio.overrideAttrs { + inherit version; + + src = fetchFromGitHub { + owner = "AcademySoftwareFoundation"; + repo = "OpenImageIO"; + tag = "v${version}"; + hash = "sha256-d5LqRcqWj6E9jJYY/Pa5e7/MeuQGMjUo/hMCYRKsKeU="; + }; +} diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/by-name/op/openimageio/package.nix similarity index 71% rename from pkgs/development/libraries/openimageio/default.nix rename to pkgs/by-name/op/openimageio/package.nix index adb25d2ab3ae..00965236dc63 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/by-name/op/openimageio/package.nix @@ -15,23 +15,17 @@ fmt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openimageio"; - version = "2.5.16.0"; + version = "3.0.5.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenImageIO"; - rev = "v${version}"; - hash = "sha256-hUCwlzQW5mJH5HYPbLWOcupc36nxM12CV0sakZhiGzo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-CG2tb6jf7xmQnrLaTqEFKG3g4nkEwZoI44bXxdCRmrM="; }; - # Workaround broken zlib version detection in CMake < 3.37. - postPatch = '' - substituteInPlace ./src/cmake/Config.cmake.in \ - --replace " @ZLIB_VERSION@" "" - ''; - outputs = [ "bin" "out" @@ -73,11 +67,11 @@ stdenv.mkDerivation rec { --replace "\''${_IMPORT_PREFIX}/lib/lib" "$out/lib/lib" ''; - meta = with lib; { + meta = { homepage = "https://openimageio.org"; description = "Library and tools for reading and writing images"; - license = licenses.bsd3; - maintainers = [ ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ yzx9 ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 17df7fa6f050..8a4f54b091c7 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -8,7 +8,7 @@ libxml2, zlib, openexr, - openimageio, + openimageio_2, llvm, boost, flex, @@ -20,9 +20,7 @@ }: let - boost_static = boost.override { enableStatic = true; }; - in stdenv.mkDerivation rec { pname = "openshadinglanguage"; @@ -65,7 +63,7 @@ stdenv.mkDerivation rec { libclang llvm openexr - openimageio + openimageio_2 partio pugixml python3.pkgs.pybind11 diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix index c3a0adf867e9..a4fd44accf6f 100644 --- a/pkgs/development/libraries/embree/2.x.nix +++ b/pkgs/development/libraries/embree/2.x.nix @@ -7,7 +7,7 @@ ispc, tbb, glfw, - openimageio, + openimageio_2, libjpeg, libpng, libpthreadstubs, @@ -35,7 +35,7 @@ stdenv.mkDerivation { ispc tbb glfw - openimageio + openimageio_2 libjpeg libpng libX11 diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index ace060f54d07..96e431e14c05 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -7,7 +7,7 @@ ispc, tbb, glfw, - openimageio, + openimageio_2, libjpeg, libpng, libpthreadstubs, @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { buildInputs = [ tbb glfw - openimageio + openimageio_2 libjpeg libpng libX11 diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix index 43b766a5662f..d15207ee0a70 100644 --- a/pkgs/development/python-modules/materialx/default.nix +++ b/pkgs/development/python-modules/materialx/default.nix @@ -8,7 +8,7 @@ libX11, libXt, libGL, - openimageio, + openimageio_2, imath, python, apple-sdk_14, @@ -37,7 +37,7 @@ buildPythonPackage rec { buildInputs = [ - openimageio + openimageio_2 imath ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index 0d1c36df8028..da2f0e13effe 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -24,7 +24,7 @@ ninja, numpy, opencolorio, - openimageio, + openimageio_2, opensubdiv, osl, ptex, @@ -132,7 +132,7 @@ buildPythonPackage rec { imath materialx opencolorio - openimageio + openimageio_2 opensubdiv ptex tbb diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49f303bf46f0..4f2525e934ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15487,8 +15487,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; - openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { - }; + openimageio_2 = callPackage ../by-name/op/openimageio/2.nix { }; open-music-kontrollers = lib.recurseIntoAttrs { eteroj = callPackage ../applications/audio/open-music-kontrollers/eteroj.nix { };