diff --git a/pkgs/by-name/jo/joplin-desktop/buildPlugin.nix b/pkgs/by-name/jo/joplin-desktop/buildPlugin.nix index 4ef26f8e1fb1..40b2d68d036a 100644 --- 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 ''; diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix index 8c90b9572407..ec93ead2a33d 100644 --- 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