diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix index 88d99a0fae76..cd219dc976f2 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , boost , cmake , giflib @@ -17,23 +16,15 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.4.6.1"; + version = "2.4.10.0"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "v${version}"; - sha256 = "sha256-oBICukkborxXFHXyM2rIn5qSbCWECjwDQI9MUg13IRU="; + hash = "sha256-EQ9/G41AZJJ+KMIwDRZDf5V0VOx5fewmebeHlPWSPCQ="; }; - patches = [ - (fetchpatch { - name = "arm-fix-signed-unsigned-simd-mismatch.patch"; - url = "https://github.com/OpenImageIO/oiio/commit/726c51181a2888b0bd1edbef5ac8451e9cc3f893.patch"; - hash = "sha256-G4vexf0OHZ/sbcRob5X92tajkmAv72ok8rcVQtIE9XE="; - }) - ]; - outputs = [ "bin" "out" "dev" "doc" ]; nativeBuildInputs = [ @@ -51,6 +42,9 @@ stdenv.mkDerivation rec { opencolorio openexr robin-map + ]; + + propagatedBuildInputs = [ fmt ]; @@ -59,6 +53,8 @@ stdenv.mkDerivation rec { "-DUSE_QT=OFF" # GNUInstallDirs "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkg-config + # Do not install a copy of fmt header files + "-DINTERNALIZE_FMT=OFF" ]; postFixup = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20f1e7b4aaae..e841f350713c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32817,9 +32817,7 @@ with pkgs; boost = boost175; }; - openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { - fmt = fmt_8; - }; + openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { }; openjump = callPackage ../applications/misc/openjump { };