Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

packaging: add truststore as optional nixos dependency #298

Merged
merged 2 commits into from
Dec 6, 2024

Conversation

R1kaB3rN
Copy link
Member

@R1kaB3rN R1kaB3rN commented Dec 5, 2024

Related to #296.

The intention is for truststore to be an optional dependency.

@LovingMelody
Copy link
Contributor

LovingMelody commented Dec 6, 2024

I set this to true by default based on the comment here:

[project.optional-dependencies]
# Recommended
# For network requests, use the system's CA bundle instead of certifi's
cli = ["truststore"]

index ef78d82..24bad46 100644
--- a/packaging/nix/umu-launcher.nix
+++ b/packaging/nix/umu-launcher.nix
@@ -1,4 +1,4 @@
-{pyth1 ,python3Packages , umu-launcher, pkgs,version, ...}:
+{lib, pyth1 ,python3Packages , umu-launcher, pkgs,version, truststore ? true, ...}:
 python3Packages.buildPythonPackage {
   pname = "umu-launcher";
   version = "${version}";
@@ -20,8 +20,7 @@ python3Packages.buildPythonPackage {
     pkgs.python3Packages.xlib
     pkgs.python3Packages.filelock
     pkgs.python3Packages.urllib3
-    pkgs.python3Packages.truststore
-  ];
+  ] ++ lib.optional truststore pkgs.python3Packages.truststore;
   makeFlags = [ "PYTHON_INTERPRETER=${pyth1}/bin/python" "SHELL_INTERPRETER=/run/current-system/sw/bin/bash" "DESTDIR=${placeholder "out"}" ];
   dontUseMesonConfigure = true;
   dontUseNinjaBuild = true;

Sorry, I have no idea how to do code change suggestions through GitHub

@R1kaB3rN R1kaB3rN marked this pull request as ready for review December 6, 2024 01:46
@R1kaB3rN R1kaB3rN changed the title packaging: add truststore as nixos dependency packaging: add truststore as optional nixos dependency Dec 6, 2024
@R1kaB3rN
Copy link
Member Author

R1kaB3rN commented Dec 6, 2024

Sorry, I have no idea how to do code change suggestions through GitHub

No problem, and thanks for the patch. To do code change suggestions, simply click the Files changed tab, hover your cursor to any line in the git diff UI, then click the plus button. The plus button should appear on hover, and from there you can write your suggestion/review.

@R1kaB3rN R1kaB3rN merged commit 1c3dd94 into Open-Wine-Components:main Dec 6, 2024
11 checks passed
@R1kaB3rN R1kaB3rN deleted the truststore-nixos-opt branch December 6, 2024 02:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants