joplin-desktop: use clang_20 to fix darwin build

2025-10-11 10:53:36 +02:00
parent 95cf4c94a4
commit 04f905fae9
2 changed files with 8 additions and 0 deletions
--- a/pkgs/by-name/jo/joplin-desktop/buildPlugin.nix
+++ b/pkgs/by-name/jo/joplin-desktop/buildPlugin.nix
@@ -1,8 +1,10 @@
 {
  lib,
+  stdenv,
  fetchzip,
  npm-lockfile-fix,
  buildNpmPackage,
+  clang_20,

  name,
  url,
@@ -22,6 +24,10 @@ buildNpmPackage {
    '';
  };

+  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    clang_20 # clang_21 breaks keytar
+  ];
+
  postPatch = ''
    sed -i '/preinstall/d' package.json
  '';
--- a/pkgs/by-name/jo/joplin-desktop/package.nix
+++ b/pkgs/by-name/jo/joplin-desktop/package.nix
@@ -19,6 +19,7 @@
  callPackage,
  runCommand,
  libGL,
+  clang_20,
 }:

 let
@@ -99,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
  ++ lib.optionals stdenv.hostPlatform.isDarwin [
    xcbuild
    buildPackages.cctools
+    clang_20 # clang_21 breaks keytar, sqlite
  ]
  ++ lib.optionals stdenv.hostPlatform.isLinux [
    copyDesktopItems