summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorDmitry Kalinkin <dmitry.kalinkin@gmail.com>2021-06-25 10:39:43 -0400
committerGitHub <noreply@github.com>2021-06-25 10:39:43 -0400
commit9959bb87e828206c365d87fee72ff740a4a89dcc (patch)
tree4539a8a5516c89efb96ee62e99b6b113465b9238 /pkgs/top-level
parentd4826151d4461aecf5eeda12cea75e77df7f72e9 (diff)
parenta1d1b7e2849b926ec2affdfad4814393a74b6f54 (diff)
downloadnixpkgs-9959bb87e828206c365d87fee72ff740a4a89dcc.tar
nixpkgs-9959bb87e828206c365d87fee72ff740a4a89dcc.tar.gz
nixpkgs-9959bb87e828206c365d87fee72ff740a4a89dcc.tar.bz2
nixpkgs-9959bb87e828206c365d87fee72ff740a4a89dcc.tar.lz
nixpkgs-9959bb87e828206c365d87fee72ff740a4a89dcc.tar.xz
nixpkgs-9959bb87e828206c365d87fee72ff740a4a89dcc.tar.zst
nixpkgs-9959bb87e828206c365d87fee72ff740a4a89dcc.zip
Merge pull request #127522 from rytone/ocio2
blender: Switch to OpenColorIO 2.x
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c78b0647f1..8fd46c1bc14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8118,6 +8118,8 @@ in
 
   pywal = with python3Packages; toPythonApplication pywal;
 
+  pystring = callPackage ../development/libraries/pystring {};
+
   rbw = callPackage ../tools/security/rbw {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -17574,7 +17576,10 @@ in
 
   openldap = callPackage ../development/libraries/openldap { };
 
-  opencolorio = callPackage ../development/libraries/opencolorio { };
+  opencolorio = callPackage ../development/libraries/opencolorio {
+    inherit (darwin.apple_sdk.frameworks) Carbon GLUT Cocoa;
+  };
+  opencolorio_1 = callPackage ../development/libraries/opencolorio/1.x.nix { };
 
   opendmarc = callPackage ../development/libraries/opendmarc { };