From b3923af338303e95bc5d31447c34384b93177bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= Date: Fri, 9 Sep 2022 11:12:32 +0200 Subject: [PATCH] cryptography: correctly identify when a wheel is used as input --- overrides/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/overrides/default.nix b/overrides/default.nix index 97e19dc..f914573 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -362,8 +362,9 @@ lib.composeManyExtensions [ lib.warn "Unknown cryptography version: '${version}'. Please update getCargoHash." lib.fakeHash ); sha256 = getCargoHash super.cryptography.version; + isWheel = lib.hasSuffix ".whl" super.cryptography.src; scrypto = - if lib.versionAtLeast super.cryptography.version "35" && sha256 == null then + if isWheel then ( super.cryptography.override { preferWheel = true; } ) else super.cryptography; @@ -374,7 +375,7 @@ lib.composeManyExtensions [ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ lib.optional (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ] ++ lib.optional (!self.isPyPy) pyBuildPackages.cffi - ++ lib.optional (lib.versionAtLeast old.version "3.5") + ++ lib.optional (lib.versionAtLeast old.version "3.5" && !isWheel) (with pkgs.rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]); buildInputs = (old.buildInputs or [ ]) ++ [ (if lib.versionAtLeast old.version "37" then pkgs.openssl_3 else pkgs.openssl_1_1) ] @@ -382,7 +383,7 @@ lib.composeManyExtensions [ propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ self.cffi ]; } // lib.optionalAttrs (lib.versionAtLeast old.version "3.4" && lib.versionOlder old.version "3.5") { CRYPTOGRAPHY_DONT_BUILD_RUST = "1"; - } // lib.optionalAttrs (lib.versionAtLeast old.version "35" && sha256 != null) rec { + } // lib.optionalAttrs (lib.versionAtLeast old.version "3.5" && !isWheel) rec { cargoDeps = pkgs.rustPlatform.fetchCargoTarball { src = old.src;