From bf3fb8a2550cc09b20cbdcc7cd73e8daca20f219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Wed, 6 Dec 2023 18:35:20 +0100 Subject: [PATCH 1/2] build-support/fetchpijul: Add cacert dependency and set impureEnvVars --- pkgs/build-support/fetchpijul/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/fetchpijul/default.nix b/pkgs/build-support/fetchpijul/default.nix index ca7e1a7926e80..dd78497d94b64 100644 --- a/pkgs/build-support/fetchpijul/default.nix +++ b/pkgs/build-support/fetchpijul/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, pijul }: +{ lib, stdenvNoCC, pijul, cacert }: lib.makeOverridable ( { url @@ -17,7 +17,7 @@ if change != null && state != null then else stdenvNoCC.mkDerivation { inherit name; - nativeBuildInputs = [ pijul ]; + nativeBuildInputs = [ pijul cacert ]; dontUnpack = true; dontConfigure = true; @@ -52,5 +52,7 @@ else lib.fakeSha256; inherit url change state channel; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars; } ) From b9c45ec6b8f037756198e1c04588f3f4f689ce3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Wed, 6 Dec 2023 18:38:19 +0100 Subject: [PATCH 2/2] build-support/fetchpijul: Enable strictDeps --- pkgs/build-support/fetchpijul/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchpijul/default.nix b/pkgs/build-support/fetchpijul/default.nix index dd78497d94b64..fd41cfa55355c 100644 --- a/pkgs/build-support/fetchpijul/default.nix +++ b/pkgs/build-support/fetchpijul/default.nix @@ -18,6 +18,7 @@ else stdenvNoCC.mkDerivation { inherit name; nativeBuildInputs = [ pijul cacert ]; + strictDeps = true; dontUnpack = true; dontConfigure = true;