joplin-desktop: use clang_20 to fix darwin build
This commit is contained in:
@@ -1,8 +1,10 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
|
stdenv,
|
||||||
fetchzip,
|
fetchzip,
|
||||||
npm-lockfile-fix,
|
npm-lockfile-fix,
|
||||||
buildNpmPackage,
|
buildNpmPackage,
|
||||||
|
clang_20,
|
||||||
|
|
||||||
name,
|
name,
|
||||||
url,
|
url,
|
||||||
@@ -22,6 +24,10 @@ buildNpmPackage {
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
|
clang_20 # clang_21 breaks keytar
|
||||||
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
sed -i '/preinstall/d' package.json
|
sed -i '/preinstall/d' package.json
|
||||||
'';
|
'';
|
||||||
|
|||||||
@@ -19,6 +19,7 @@
|
|||||||
callPackage,
|
callPackage,
|
||||||
runCommand,
|
runCommand,
|
||||||
libGL,
|
libGL,
|
||||||
|
clang_20,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@@ -99,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
xcbuild
|
xcbuild
|
||||||
buildPackages.cctools
|
buildPackages.cctools
|
||||||
|
clang_20 # clang_21 breaks keytar, sqlite
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||||
copyDesktopItems
|
copyDesktopItems
|
||||||
|
|||||||
Reference in New Issue
Block a user