From eec3e7a7f2eb26a984e0d820b38b0ac97152b23a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Mon, 9 Mar 2026 15:51:49 +0100 Subject: [PATCH] Use nativeBuildInputs zip in nix-portable build --- pkgs/nix-portable/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/nix-portable/default.nix b/pkgs/nix-portable/default.nix index ac5f8bff..45a09a60 100644 --- a/pkgs/nix-portable/default.nix +++ b/pkgs/nix-portable/default.nix @@ -593,7 +593,7 @@ let runtimeScriptEscaped = replaceStrings ["\""] ["\\\""] runtimeScript; nixPortable = pkgs.runCommand pname { - nativeBuildInputs = [unixtools.xxd unzip]; + nativeBuildInputs = [unixtools.xxd unzip pkgs.zip]; meta = { homepage = "https://github.com/DavHau/nix-portable"; @@ -621,7 +621,7 @@ let unzip -vl $out/bin/nix-portable.zip - zip="${zip}/bin/zip -0" + zip="zip -0" $zip $out/bin/nix-portable.zip ${bwrap}/bin/bwrap $zip $out/bin/nix-portable.zip ${nixStatic}/bin/nix $zip $out/bin/nix-portable.zip ${zstd}/bin/zstd @@ -632,7 +632,7 @@ let fp=$(sha256sum $out/bin/nix-portable.zip | cut -d " " -f 1) sed -i "s/_FINGERPRINT_PLACEHOLDER_/$fp/g" $out/bin/nix-portable.zip # fix broken zip header due to manual modification - ${zip}/bin/zip -F $out/bin/nix-portable.zip --out $out/bin/nix-portable-fixed.zip + zip -F $out/bin/nix-portable.zip --out $out/bin/nix-portable-fixed.zip rm $out/bin/nix-portable.zip executable=${if bundledPackage == null then "" else bundledExe}