From 61943779c4268749cdefe2e82fa06b35ea913b62 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Mon, 27 Oct 2025 11:13:45 -0700 Subject: [PATCH] python3Packages.kaleido: remove sbcl dependency (!!!) (minimal) This package was introduced in #339136, which attracted quite a bit of conversation. I don't have the energy to go through the conversations but it looks like some low-hanging fruit got overlooked. This package depends on `sbcl` (!!) in order to get `fontconfig` files for `dejavu` (!!!), which is ... already in the default `pkgs.fontconfig` config files. This is a stripped-down version of #454818 to (hopefully) expedite its merge. --- pkgs/development/python-modules/kaleido/default.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/kaleido/default.nix b/pkgs/development/python-modules/kaleido/default.nix index a155dd55bf2b..fcaf7d5adaac 100644 --- a/pkgs/development/python-modules/kaleido/default.nix +++ b/pkgs/development/python-modules/kaleido/default.nix @@ -15,7 +15,6 @@ makeWrapper, nspr, nss, - sbclPackages, sqlite, }: @@ -59,7 +58,6 @@ buildPythonPackage rec { libGL nspr nss - sbclPackages.cl-dejavu sqlite ]; @@ -82,15 +80,7 @@ buildPythonPackage rec { rm -rf $out/${python.sitePackages}/kaleido/executable/etc/fonts mkdir -p $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d ln -s ${fontconfig.out}/etc/fonts/fonts.conf $out/${python.sitePackages}/kaleido/executable/etc/fonts/ - ls -s ${fontconfig.out}/etc/fonts/conf.d/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/ - ln -s ${sbclPackages.cl-dejavu}/dejavu-fonts-ttf-2.37/fontconfig/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/ - - # Replace bundled fonts with nixpkgs-packaged fonts - # Currently this causes an issue where the fonts aren't found. I'm not sure why, so I'm leaving this commented out for now. - #rm -rf $out/${python.sitePackages}/kaleido/executable/xdg/fonts - #mkdir -p $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato - #ln -s ${dejavu_fonts}/share/fonts/truetype/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu/ - #ln -s ${lato}/share/fonts/lato/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato/ + ln -s ${fontconfig.out}/etc/fonts/conf.d/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/ '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # Replace bundled swiftshader with libGL