From 8aba7c43d1f6c4ec00fc5a0e1911c0d562b0b303 Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Mon, 10 Apr 2023 23:56:11 +0200
Subject: [PATCH 1/2] openimageio: 2.4.6.1 -> 2.4.10.0

Update to the most recent release and unpin from fmt_8.
---
 .../libraries/openimageio/default.nix          | 18 +++++++-----------
 pkgs/top-level/all-packages.nix                |  4 +---
 2 files changed, 8 insertions(+), 14 deletions(-)

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 { };
 

From 46559d5fca477f1d5ce692253be958b64abd6834 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 23 Apr 2023 15:13:23 +0100
Subject: [PATCH 2/2] openimageio_1: add CVE-2023-22845, CVE-2023-24472 &
 CVE-2023-24473 to knownVulnerabilities

---
 pkgs/development/libraries/openimageio/1.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/openimageio/1.x.nix b/pkgs/development/libraries/openimageio/1.x.nix
index 62dd3f4cc2c9..90d8df5f5a5a 100644
--- a/pkgs/development/libraries/openimageio/1.x.nix
+++ b/pkgs/development/libraries/openimageio/1.x.nix
@@ -72,6 +72,9 @@ stdenv.mkDerivation rec {
       "CVE-2022-43601"
       "CVE-2022-43602"
       "CVE-2022-43603"
+      "CVE-2023-22845"
+      "CVE-2023-24472"
+      "CVE-2023-24473"
     ];
   };
 }