From 7660fe5ce074bcfb40acc0719fc904f1f5e1fea6 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Mon, 19 May 2025 19:32:11 +0800
Subject: [PATCH] osl: 1.13.11.0 -> 1.14.5.1

---
 pkgs/development/compilers/osl/default.nix | 14 +++++++++-----
 pkgs/top-level/all-packages.nix            |  6 +++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix
index 8a4f54b091c7..ad66b987c5f5 100644
--- a/pkgs/development/compilers/osl/default.nix
+++ b/pkgs/development/compilers/osl/default.nix
@@ -15,6 +15,7 @@
   bison,
   partio,
   pugixml,
+  robin-map,
   util-linux,
   python3,
 }:
@@ -24,13 +25,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "openshadinglanguage";
-  version = "1.13.11.0";
+  version = "1.14.5.1";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenShadingLanguage";
     rev = "v${version}";
-    hash = "sha256-E/LUTtT0ZU0SBuwtJPA0FznvOuc2a3aJn2/n3ru5l0s=";
+    hash = "sha256-dmGVCx4m2bkeKhAJbU1mrzEDAmnL++7GA5okb9wwk/Y=";
   };
 
   cmakeFlags = [
@@ -43,11 +44,13 @@ stdenv.mkDerivation rec {
     "-DLLVM_DIRECTORY=${llvm}"
     "-DLLVM_CONFIG=${llvm.dev}/bin/llvm-config"
     "-DLLVM_BC_GENERATOR=${clang}/bin/clang++"
-
-    # Set C++11 to C++14 required for LLVM10+
-    "-DCMAKE_CXX_STANDARD=14"
   ];
 
+  prePatch = ''
+    substituteInPlace src/cmake/modules/FindLLVM.cmake \
+      --replace-fail "NO_DEFAULT_PATH" ""
+  '';
+
   preConfigure = "patchShebangs src/liboslexec/serialize-bc.bash ";
 
   nativeBuildInputs = [
@@ -67,6 +70,7 @@ stdenv.mkDerivation rec {
       partio
       pugixml
       python3.pkgs.pybind11
+      robin-map
       util-linux # needed just for hexdump
       zlib
     ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6215f373cde0..a274161f2144 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4098,9 +4098,9 @@ with pkgs;
   };
 
   osl = libsForQt5.callPackage ../development/compilers/osl {
-    libclang = llvmPackages_15.libclang;
-    clang = clang_15;
-    llvm = llvm_15;
+    libclang = llvmPackages_19.libclang;
+    clang = clang_19;
+    llvm = llvm_19;
   };
 
   ossec-agent = callPackage ../tools/security/ossec/agent.nix { };