From 2d3a1e839e4839ab2f575ea2226b4003ae65dd4b Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sat, 2 May 2020 18:07:21 +0200 Subject: [PATCH] electrs: fix conditional cargoSha256 --- pkgs/electrs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/electrs/default.nix b/pkgs/electrs/default.nix index 05202cb..e29efd6 100644 --- a/pkgs/electrs/default.nix +++ b/pkgs/electrs/default.nix @@ -13,8 +13,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ llvmPackages.clang ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - cargoSha256 = if pkgs ? cargo-vendor then - # nixpkgs ≤ 19.09 + cargoSha256 = if builtins.pathExists "${pkgs.path}/pkgs/build-support/rust/fetchcargo.nix" then + # nixpkgs ≤ 20.03 "19qs8if8fmygv6j74s6iwzm534fybwasjvmzdqcl996xhg75w6gi" else # for recent nixpkgs with cargo-native vendoring (introduced in nixpkgs PR #69274)