From eb1df01d46e245119c809ca175d7927ea2474d9a Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 11 Sep 2022 15:39:41 +0100 Subject: [PATCH] opencolorio: fix build on darwin x86_64 use macos sdk 11.0 to allow Metal support to compile, but revert use of -hidden-l because our toolchain on darwin x86_64 is too old to support that --- pkgs/development/libraries/opencolorio/default.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 81ab688b6436..dd6c31792b10 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake , expat , libyamlcpp @@ -35,6 +36,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-e1PpWjjfSjtgN9Rs/+lsA45Z9S4y4T6nqrJ02DZ4vjs="; }; + patches = [ + (fetchpatch { + name = "darwin-no-hidden-l.patch"; + url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/48bab7c643ed8d108524d718e5038d836f906682.patch"; + revert = true; + sha256 = "sha256-0DF+lwi2nfkUFG0wYvL3HYbhZS6SqGtPWoOabrFS1Eo="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ expat diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1090104cccfd..7d27de71e755 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20871,8 +20871,8 @@ with pkgs; openldap = callPackage ../development/libraries/openldap { }; - opencolorio = callPackage ../development/libraries/opencolorio { - inherit (darwin.apple_sdk.frameworks) Carbon GLUT Cocoa; + opencolorio = darwin.apple_sdk_11_0.callPackage ../development/libraries/opencolorio { + inherit (darwin.apple_sdk_11_0.frameworks) Carbon GLUT Cocoa; }; opencolorio_1 = callPackage ../development/libraries/opencolorio/1.x.nix { };