From 96e3dd4aa1de9011e9fff57eddb38517a85e71e8 Mon Sep 17 00:00:00 2001 From: ShaddyDC Date: Mon, 20 Nov 2023 09:48:32 +0100 Subject: [PATCH 1/2] osl: fix build, 1.12.13.0 -> 1.12.14.0 --- pkgs/development/compilers/osl/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 3 +++ 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 { }; From 12b56aea48c519b4147a991ad4fedbf263d5a6b8 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 21 Nov 2023 00:59:10 +0100 Subject: [PATCH 2/2] osl: fix build on darwin --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30279a8c3e3b7..2a0697403c7ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11757,7 +11757,10 @@ with pkgs; osl = libsForQt5.callPackage ../development/compilers/osl { boost = boost179; libclang = llvmPackages_15.libclang; - clang = clang_15; + clang = + if stdenv.cc.libcxx != null + then (overrideLibcxx llvmPackages_15.stdenv).cc + else clang_15; llvm = llvm_15; };