mirror of
https://github.com/vale981/poetry2nix
synced 2025-03-04 16:51:40 -05:00
Merge pull request #737 from talyz/master
overrides: Choose the correct OpenSSL version for cryptography
This commit is contained in:
commit
349bf3f03c
1 changed files with 2 additions and 1 deletions
|
@ -352,7 +352,8 @@ lib.composeManyExtensions [
|
||||||
++ lib.optional (!self.isPyPy) pyBuildPackages.cffi
|
++ lib.optional (!self.isPyPy) pyBuildPackages.cffi
|
||||||
++ lib.optional (lib.versionAtLeast old.version "3.5")
|
++ lib.optional (lib.versionAtLeast old.version "3.5")
|
||||||
(with pkgs.rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);
|
(with pkgs.rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);
|
||||||
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ]
|
buildInputs = (old.buildInputs or [ ])
|
||||||
|
++ [ (if lib.versionAtLeast old.version "37" then pkgs.openssl_3 else pkgs.openssl_1_1) ]
|
||||||
++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security pkgs.libiconv ];
|
++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security pkgs.libiconv ];
|
||||||
propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ self.cffi ];
|
propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ self.cffi ];
|
||||||
} // lib.optionalAttrs (lib.versionAtLeast old.version "3.4" && lib.versionOlder old.version "3.5") {
|
} // lib.optionalAttrs (lib.versionAtLeast old.version "3.4" && lib.versionOlder old.version "3.5") {
|
||||||
|
|
Loading…
Add table
Reference in a new issue