b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #208716 from wegank/osl-aarch64-linux

Browse source 
osl: unbreak on aarch64-linux
This commit is contained in:
Robert Scott 2023-01-03 21:32:17 +00:00 committed by GitHub
parent b708a3523a 15ef0c2a76
commit 11e43555d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/compilers/osl/default.nix
View file

@ -33,6 +33,7 @@ in stdenv.mkDerivation rec {
};
cmakeFlags = [
"-DBoost_ROOT=${boost}"
"-DUSE_BOOST_WAVE=ON"
"-DENABLE_RTTI=ON"
@ -73,7 +74,6 @@ in stdenv.mkDerivation rec {
'';
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64);
description = "Advanced shading language for production GI renderers";
homepage = "https://opensource.imageworks.com/osl.html";
maintainers = with maintainers; [ hodapp ];

2
pkgs/top-level/all-packages.nix
View file

@ -10350,7 +10350,7 @@ with pkgs;
oshka = callPackage ../development/tools/oshka {};
osl = libsForQt5.callPackage ../development/compilers/osl {
boost = boost165;
boost = boost17x;
};
osqp = callPackage ../development/libraries/science/math/osqp { };