diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-07-05 09:27:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-05 09:27:33 +0300 |
| commit | a7fcb2ed122004a1d7677196da1497c43eb1eedf (patch) | |
| tree | 2553b7e3f54b2e4b4931fe00ee987e770b754ca2 | |
| parent | e48882a9bc9b4e17be2ce52579283d2626aa9930 (diff) | |
| parent | 88c997ed52774e61a6790fda90931e05ecfb54f5 (diff) | |
Merge pull request #241563 from wegank/opencolorio-fix
opencolorio: fix build
| -rw-r--r-- | pkgs/development/libraries/minizip-ng/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencolorio/default.nix | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index 9be33beff60e5..385b5707754f6 100644 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: { "-DMZ_OPENSSL=ON" "-DMZ_BUILD_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" "-DMZ_BUILD_UNIT_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DMZ_LIB_SUFFIX='-ng'" ] ++ lib.optionals stdenv.isDarwin [ # missing header file "-DMZ_LIBCOMP=OFF" diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 3d8a5588043fe..40a64077acc93 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -48,6 +48,11 @@ stdenv.mkDerivation rec { url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/332462e7f5051b7e26ee3d8c22890cd5e71e7c30.patch"; sha256 = "sha256-7xHALhnOkKszgFBgPIbiZQaORnEJ+1M6RyoZdFgjElM="; }) + (fetchpatch { + name = "minizip-ng-4.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/opencolorio/-/raw/5fc40f42f5c05d905793610c37b46ca3649245f3/minizip-ng-4.patch"; + hash = "sha256-B+dbBVRn0EuGtJaWxz5ah9el0RN7cLb81hgqnKkvhew="; + }) ]; postPatch = lib.optionalString stdenv.isDarwin '' @@ -78,6 +83,7 @@ stdenv.mkDerivation rec { "-DOCIO_INSTALL_EXT_PACKAGES=NONE" # GPU test fails with: freeglut (GPU tests): failed to open display '' "-DOCIO_BUILD_GPU_TESTS=OFF" + "-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include" ] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; |