From 43d55e35cb0013a6ff02bbcadfcec288074df2bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Mon, 9 Mar 2026 15:39:34 +0100 Subject: [PATCH] Use native zstd when building nix-portable --- pkgs/nix-portable/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/nix-portable/default.nix b/pkgs/nix-portable/default.nix index a1b3c6e7..232547ab 100644 --- a/pkgs/nix-portable/default.nix +++ b/pkgs/nix-portable/default.nix @@ -49,7 +49,7 @@ let in stdenv.mkDerivation { name = "nix-portable-store-tarball"; - nativeBuildInputs = [ perl zstd ]; + nativeBuildInputs = [ perl pkgs.zstd ]; exportReferencesGraph = map (x: [("closure-" + baseNameOf x) x]) targets; buildCommand = '' storePaths=$(cat ${closureInfo}/store-paths) @@ -100,7 +100,9 @@ let export PATH="${out}/bin:\$PATH" ''; - caBundleZstd = pkgs.runCommand "cacerts" {} "cat ${cacert}/etc/ssl/certs/ca-bundle.crt | ${inp.zstd}/bin/zstd -19 > $out"; + caBundleZstd = pkgs.runCommand "cacerts" { + nativeBuildInputs = [ pkgs.zstd ]; + } "cat ${cacert}/etc/ssl/certs/ca-bundle.crt | zstd -19 > $out"; bwrap = packStaticBin "${inp.bwrap}/bin/bwrap"; nixStatic = packStaticBin "${inp.nixStatic}/bin/nix";