cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #190805 from risicle/ris-opencolorio-darwin-no-hidden-l

Browse source
This commit is contained in:
Sandro 2022-09-17 23:58:16 +02:00 committed by GitHub
commit 6560d311d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/libraries/opencolorio/default.nix
View file

@ -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

4
pkgs/top-level/all-packages.nix
View file

@ -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 { };