pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #225645 from panicgh/osl

authored by

Sandro and committed by
GitHub d9ad436f 90241ecb

+3 -2
unified split
+3 -2
pkgs/development/compilers/osl/default.nix
··· 23 24 in stdenv.mkDerivation rec { 25 pname = "openshadinglanguage"; 26 - version = "1.11.17.0"; 27 28 src = fetchFromGitHub { 29 owner = "AcademySoftwareFoundation"; 30 repo = "OpenShadingLanguage"; 31 rev = "v${version}"; 32 - sha256 = "sha256-2OOkLnHLz+vmSeEDQl12SrJBTuWwbnvoTatnvm8lpbA="; 33 }; 34 35 cmakeFlags = [ ··· 41 # Override defaults. 42 "-DLLVM_DIRECTORY=${llvm}" 43 "-DLLVM_CONFIG=${llvm.dev}/bin/llvm-config" 44 45 # Set C++11 to C++14 required for LLVM10+ 46 "-DCMAKE_CXX_STANDARD=14"
··· 23 24 in stdenv.mkDerivation rec { 25 pname = "openshadinglanguage"; 26 + version = "1.12.11.0"; 27 28 src = fetchFromGitHub { 29 owner = "AcademySoftwareFoundation"; 30 repo = "OpenShadingLanguage"; 31 rev = "v${version}"; 32 + hash = "sha256-kN0+dWOUPXK8+xtR7onuPNimdn8WcaKcSRkOnaoi7BQ="; 33 }; 34 35 cmakeFlags = [ ··· 41 # Override defaults. 42 "-DLLVM_DIRECTORY=${llvm}" 43 "-DLLVM_CONFIG=${llvm.dev}/bin/llvm-config" 44 + "-DLLVM_BC_GENERATOR=${clang}/bin/clang++" 45 46 # Set C++11 to C++14 required for LLVM10+ 47 "-DCMAKE_CXX_STANDARD=14"