Unverified Commit 77f37952 authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

joplin-desktop: use clang_20 to fix darwin build (#450940)

parents f0a0e146 04f905fa

pkgs/by-name/jo/joplin-desktop/buildPlugin.nix

+6 −0
Original line number Diff line number Diff line 
{

  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

  '';

pkgs/by-name/jo/joplin-desktop/package.nix

+2 −0
Original line number Diff line number Diff line
@@ -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