From ba1d9379179e204e025490669c230f46bef5aacf Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 13 Jun 2022 17:36:08 +0200 Subject: [PATCH] cacert: Drop python3Minimal This PR, https://github.com/NixOS/nixpkgs/pull/176291, started building `cacert` with `python3Minimal` to work around an infinite recursion problem with the `mailcap` build. This causes problems now because `buildcatrust` requires the `_scproxy` module and that's not built for `python3Minimal` on Darwin. This causes many transitive failures. Simply building `cacert` with `python3` seems to work fine. The `mailcap` expression has since been altered and this infinite recursion issue doesn't reappear. (cherry picked from commit 1e1539c281879fa7ac4b1e2ad5cfba42a78963f9) (effectively a revert of 526a0b8047a18e8e2b3cfb309408b2b83ccb7a89) --- pkgs/top-level/all-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc05e05c77ae..0cefa1d65a98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24076,10 +24076,7 @@ with pkgs; brise = callPackage ../data/misc/brise { }; - cacert = callPackage ../data/misc/cacert { - # avoid an infinite recursion through mailcap - buildcatrust = with python3Minimal.pkgs; toPythonApplication buildcatrust; - }; + cacert = callPackage ../data/misc/cacert { }; caladea = callPackage ../data/fonts/caladea {};