mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-04 04:46:43 +00:00
Merge pull request #190805 from risicle/ris-opencolorio-darwin-no-hidden-l
This commit is contained in:
commit
6560d311d5
@ -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
|
||||
|
@ -21023,8 +21023,8 @@ with pkgs;
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
|
||||
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 { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user