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 e3c4aa9935a04..a059ef139c773 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11759,6 +11759,12 @@ with pkgs; osl = libsForQt5.callPackage ../development/compilers/osl { boost = boost179; + libclang = llvmPackages_15.libclang; + clang = + if stdenv.cc.libcxx != null + then (overrideLibcxx llvmPackages_15.stdenv).cc + else clang_15; + llvm = llvm_15; }; osqp = callPackage ../development/libraries/science/math/osqp { };