From 68dff9dcf685bd25ea3bc56fdcefd6455366d5b0 Mon Sep 17 00:00:00 2001 From: eljamm Date: Sun, 21 Jul 2024 09:37:10 +0100 Subject: [PATCH] joplin: fix build Joplin broke after the update to python 3.12 because of missing distutils. This change adds setuptools which replaces it and makes the package build successfully. --- pkgs/development/node-packages/overrides.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 9e8d268f1cf6..2f9dcd6ae291 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -88,6 +88,7 @@ final: prev: { joplin = prev.joplin.override (oldAttrs:{ nativeBuildInputs = [ pkgs.pkg-config + (pkgs.python3.withPackages (ps: [ ps.setuptools ])) ] ++ lib.optionals stdenv.isDarwin [ pkgs.xcbuild ]; @@ -124,7 +125,7 @@ final: prev: { meta = oldAttrs.meta // { # ModuleNotFoundError: No module named 'distutils' - broken = true; + broken = stdenv.isDarwin; # still broken on darwin }; });