diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2023-04-24 00:37:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-24 00:37:48 +0200 |
| commit | d9ad436f9a3ee28ecb8f73723b201d0d84b6366b (patch) | |
| tree | b889ccd5b69b3998446b94abbdb60ca43f016acc | |
| parent | 90241ecb8fc02f81a5d76e67d52e50dc30460154 (diff) | |
| parent | 4d41c9374502b1f666ad7b0db3ec97a7c1492d46 (diff) | |
| download | nixpkgs-d9ad436f9a3ee28ecb8f73723b201d0d84b6366b.tar nixpkgs-d9ad436f9a3ee28ecb8f73723b201d0d84b6366b.tar.gz nixpkgs-d9ad436f9a3ee28ecb8f73723b201d0d84b6366b.tar.bz2 nixpkgs-d9ad436f9a3ee28ecb8f73723b201d0d84b6366b.tar.lz nixpkgs-d9ad436f9a3ee28ecb8f73723b201d0d84b6366b.tar.xz nixpkgs-d9ad436f9a3ee28ecb8f73723b201d0d84b6366b.tar.zst nixpkgs-d9ad436f9a3ee28ecb8f73723b201d0d84b6366b.zip | |
Merge pull request #225645 from panicgh/osl
| -rw-r--r-- | pkgs/development/compilers/osl/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 5f56966cd48..6830944d81d 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { pname = "openshadinglanguage"; - version = "1.11.17.0"; + version = "1.12.11.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenShadingLanguage"; rev = "v${version}"; - sha256 = "sha256-2OOkLnHLz+vmSeEDQl12SrJBTuWwbnvoTatnvm8lpbA="; + hash = "sha256-kN0+dWOUPXK8+xtR7onuPNimdn8WcaKcSRkOnaoi7BQ="; }; cmakeFlags = [ @@ -41,6 +41,7 @@ in stdenv.mkDerivation rec { # Override defaults. "-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" |