Merge branch 'master' into staging

2020-07-18 17:50:23 +02:00
parent 5b14758d31 41a323711a
commit 4244b73917
181 changed files with 6696 additions and 6649 deletions
@@ -43,6 +43,10 @@ stdenv.mkDerivation rec {
    libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
    libPathPrefix = "$out/lib/darktable" + stdenv.lib.optionalString stdenv.isLinux ":${ocl-icd}/lib";
  in ''
+    for f in $out/share/darktable/kernels/*.cl; do
+      sed -r "s|#include \"(.*)\"|#include \"$out/share/darktable/kernels/\1\"|g" -i "$f"
+    done
+
    gappsWrapperArgs+=(
      --prefix ${libPathEnvVar} ":" "${libPathPrefix}"
    )