From 3fb3d85833571f3e20c798a527700117eb296d97 Mon Sep 17 00:00:00 2001
From: Matt Moriarity <matt@mattmoriarity.com>
Date: Thu, 9 Jan 2025 15:39:00 -0700
Subject: [PATCH] opencolorio: add explicit zlib input

---
 .../opencolorio/broken-cmake-zlib-version.patch | 17 -----------------
 .../libraries/opencolorio/default.nix           |  5 ++---
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch

diff --git a/pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch b/pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch
deleted file mode 100644
index e60ebc9e1efe..000000000000
--- a/pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in
-index c122b013..04f36bf0 100644
---- a/src/cmake/Config.cmake.in
-+++ b/src/cmake/Config.cmake.in
-@@ -43,11 +43,7 @@ if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@
-         # ZLIB_VERSION_STRING is still available for backward compatibility.
-         # See https://cmake.org/cmake/help/git-stage/module/FindZLIB.html
- 
--        if (@ZLIB_VERSION@) # @ZLIB_VERSION@
--            find_dependency(ZLIB @ZLIB_VERSION@)
--        else()
--            find_dependency(ZLIB @ZLIB_VERSION_STRING@)
--        endif()
-+        find_dependency(ZLIB)
-     endif()
- 
-     if (NOT TARGET MINIZIP::minizip-ng)
diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
index 8a2d452f7d3a..66e0cf09e3ab 100644
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -8,6 +8,7 @@
   pystring,
   imath,
   minizip-ng,
+  zlib,
   # Only required on Linux
   glew,
   libglut,
@@ -36,9 +37,6 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    # Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25200.
-    # Needed for zlib >= 1.3 && cmake < 3.27.4.
-    ./broken-cmake-zlib-version.patch
     # Fix incorrect line number in test
     ./line-numbers.patch
   ];
@@ -59,6 +57,7 @@ stdenv.mkDerivation rec {
       pystring
       imath
       minizip-ng
+      zlib
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       glew