Unverified Commit 8bb8ec3b authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #270302 from NixOS/backport-268670-to-release-23.11 

[Backport release-23.11] osl: fix build, 1.12.13.0 -> 1.12.14.0
parents d218f5e6 3fae5832

pkgs/development/compilers/osl/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/top-level/all-packages.nix

+6 −0
Original line number Diff line number Diff line
@@ -11764,6 +11764,12 @@ with pkgs; 














  osl = libsForQt5.callPackage ../development/compilers/osl {















    boost = boost179;













    libclang = llvmPackages_15.libclang;













    clang =













      if stdenv.cc.libcxx != null













      then (overrideLibcxx llvmPackages_15.stdenv).cc













      else clang_15;













    llvm = llvm_15;















  };





























  osqp = callPackage ../development/libraries/science/math/osqp { };