Merge pull request #299668 from skeuchel/riscv-gegl

gegl: disable lua on platforms where luajit is unavailable
This commit is contained in:
Jan Tojnar
2024-06-01 09:43:23 +02:00
committed by GitHub
+5 -1
View File
@@ -31,6 +31,7 @@
, openexr
, OpenCL
, suitesparse
, withLuaJIT ? lib.meta.availableOn stdenv.hostPlatform luajit
}:
stdenv.mkDerivation rec {
@@ -71,13 +72,14 @@ stdenv.mkDerivation rec {
libraw
libwebp
gexiv2
luajit
openexr
suitesparse
] ++ lib.optionals stdenv.isDarwin [
OpenCL
] ++ lib.optionals stdenv.cc.isClang [
llvmPackages.openmp
] ++ lib.optionals withLuaJIT [
luajit
];
# for gegl-4.0.pc
@@ -97,6 +99,8 @@ stdenv.mkDerivation rec {
# Disabled due to multiple vulnerabilities, see
# https://github.com/NixOS/nixpkgs/pull/73586
"-Djasper=disabled"
] ++ lib.optionals (!withLuaJIT) [
"-Dlua=disabled"
];
postPatch = ''