abonerib/jungle
1
0
Fork 0
forked from rarias/jungle
Code Pull Requests 2 Actions Activity

Use native zstd when building nix-portable

Browse Source
This commit is contained in:
Aleix Boné
2026-03-09 15:39:34 +01:00
parent 7a1cf0165f
commit 2d86c3442d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/nix-portable/default.nix
View File

@@ -49,7 +49,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nix-portable-store-tarball"; name = "nix-portable-store-tarball";
nativeBuildInputs = [ perl zstd ]; nativeBuildInputs = [ perl pkgs.zstd ];
exportReferencesGraph = map (x: [("closure-" + baseNameOf x) x]) targets; exportReferencesGraph = map (x: [("closure-" + baseNameOf x) x]) targets;
buildCommand = '' buildCommand = ''
storePaths=$(cat ${closureInfo}/store-paths) storePaths=$(cat ${closureInfo}/store-paths)
@@ -100,7 +100,9 @@ let
export PATH="${out}/bin:\$PATH" export PATH="${out}/bin:\$PATH"
''; '';
caBundleZstd = pkgs.runCommand "cacerts" {} "cat ${cacert}/etc/ssl/certs/ca-bundle.crt | ${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 "${bwrapStatic}/bin/bwrap"; bwrap = packStaticBin "${bwrapStatic}/bin/bwrap";
nixStatic = packStaticBin "${inp.nixStatic}/bin/nix"; nixStatic = packStaticBin "${inp.nixStatic}/bin/nix";