Commit eb1df01d authored by Robert Scott's avatar Robert Scott
Browse files

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
parent 3e2341b0

pkgs/development/libraries/opencolorio/default.nix

+10 −0
Original line number Diff line number Diff line 
{ 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

pkgs/top-level/all-packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 { };