From 18d1c7e0be7bae9376d1279ca879fee0394f1693 Mon Sep 17 00:00:00 2001 From: Defelo Date: Mon, 24 Mar 2025 16:36:55 +0100 Subject: [PATCH] countryfetch: set OPENSSL_NO_VENDOR env var --- pkgs/by-name/co/countryfetch/package.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/co/countryfetch/package.nix b/pkgs/by-name/co/countryfetch/package.nix index f3ebd1d9e532..22c8e43964ea 100644 --- a/pkgs/by-name/co/countryfetch/package.nix +++ b/pkgs/by-name/co/countryfetch/package.nix @@ -2,7 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - yq, pkg-config, openssl, versionCheckHook, @@ -20,19 +19,15 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-KdFgY54vXLmq6IZfJzZ1IeZ2eQuNJoCRZUV3rVuPpcY="; }; - postPatch = '' - tomlq -ti '.dependencies.openssl.features[] |= select(.!="vendored")' countryfetch/Cargo.toml - ''; - useFetchCargoVendor = true; cargoHash = "sha256-XJI9k/5hdak8p0/J/x9u6lqJu/DIbX93Wwm3LALkAAw="; - env.RUSTC_BOOTSTRAP = 1; + env = { + RUSTC_BOOTSTRAP = 1; + OPENSSL_NO_VENDOR = true; + }; - nativeBuildInputs = [ - pkg-config - yq # for `tomlq` - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ];