pyrox.dev
Merge pull request #268670 from ShaddyDC/osl-fix
osl: fix build, 1.12.13.0 -> 1.12.14.0
authored by Peder Bergebakken Sundt and committed by GitHub 72a5d957 b9bab33a
+2
-2
pkgs/development/compilers/osl/default.nix
+2
-2
pkgs/development/compilers/osl/default.nix
···
24
25
in stdenv.mkDerivation rec {
26
pname = "openshadinglanguage";
27
-
version = "1.12.13.0";
28
29
src = fetchFromGitHub {
30
owner = "AcademySoftwareFoundation";
31
repo = "OpenShadingLanguage";
32
rev = "v${version}";
33
-
hash = "sha256-EVV7YHovWwbRju+uv8IK2wpcpoK1ndZ8yNRHzU8LUuE=";
34
};
35
36
cmakeFlags = [
···
24
25
in stdenv.mkDerivation rec {
26
pname = "openshadinglanguage";
27
+
version = "1.12.14.0";
28
29
src = fetchFromGitHub {
30
owner = "AcademySoftwareFoundation";
31
repo = "OpenShadingLanguage";
32
rev = "v${version}";
33
+
hash = "sha256-x8t7uC4q29MkTCIS1rK0ICw78u5zZG+/zyhwttLOBr4=";
34
};
35
36
cmakeFlags = [
+6
pkgs/top-level/all-packages.nix
+6
pkgs/top-level/all-packages.nix
···
11759
11760
osl = libsForQt5.callPackage ../development/compilers/osl {
11761
boost = boost179;
11762
+
libclang = llvmPackages_15.libclang;
11763
+
clang =
11764
+
if stdenv.cc.libcxx != null
11765
+
then (overrideLibcxx llvmPackages_15.stdenv).cc
11766
+
else clang_15;
11767
+
llvm = llvm_15;
11768
};
11769
11770
osqp = callPackage ../development/libraries/science/math/osqp { };