opencolorio: add explicit zlib input (#372498)

2025-01-12 19:41:41 +01:00
parent 9c9a273715 3fb3d85833
commit 407538c0e2
2 changed files with 2 additions and 20 deletions
@@ -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)
@@ -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