about summary refs log tree commit diff
diff options
context:
space:
mode:
authorShaddyDC <shaddythefirst@gmail.com>2023-11-20 09:48:32 +0100
committerShaddyDC <shaddythefirst@gmail.com>2023-11-20 11:07:30 +0100
commit96e3dd4aa1de9011e9fff57eddb38517a85e71e8 (patch)
tree3539089777f5d4ec4bcd606409cf68f42a32e694
parent01c615fb2db939c1b89e4a00b6cfbbd45b7255e6 (diff)
osl: fix build, 1.12.13.0 -> 1.12.14.0
-rw-r--r--pkgs/development/compilers/osl/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix3
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix
index 090cedb424b99..2815684878379 100644
--- a/pkgs/development/compilers/osl/default.nix
+++ b/pkgs/development/compilers/osl/default.nix
@@ -24,13 +24,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "openshadinglanguage";
-  version = "1.12.13.0";
+  version = "1.12.14.0";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenShadingLanguage";
     rev = "v${version}";
-    hash = "sha256-EVV7YHovWwbRju+uv8IK2wpcpoK1ndZ8yNRHzU8LUuE=";
+    hash = "sha256-x8t7uC4q29MkTCIS1rK0ICw78u5zZG+/zyhwttLOBr4=";
   };
 
   cmakeFlags = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index baa9cf932c1df..30279a8c3e3b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11756,6 +11756,9 @@ with pkgs;
 
   osl = libsForQt5.callPackage ../development/compilers/osl {
     boost = boost179;
+    libclang = llvmPackages_15.libclang;
+    clang = clang_15;
+    llvm = llvm_15;
   };
 
   osqp = callPackage ../development/libraries/science/math/osqp { };