From 865d73abab7b0c8d6ad44f890351ff1ff158dc13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Sj=C3=B6strom?= <lars@radicore.se>
Date: Wed, 12 Mar 2025 14:12:38 +0100
Subject: [PATCH] chore(debug-tools): add a couple of useful tools
---
flake.nix | 4 ++++
lib/make-sysext.nix | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/flake.nix b/flake.nix
index fc453e8..1276c0c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -52,6 +52,10 @@
version = "0.0.1";
packages = [
{ drv = pkgs.curl; path = "bin/curl"; }
+ { drv = pkgs.bash; path = "bin/bash"; }
+ { drv = patosPkgs.glibc; path = "bin/ldd"; }
+ { drv = pkgs.keyutils; path = "bin/keyctl"; }
+ { drv = pkgs.gnutar; path = "bin/tar"; }
{ drv = patosPkgs.tpm2-tools; path = "bin/tpm2"; }
{ drv = pkgs.cryptsetup; path = "bin/cryptsetup"; }
{ drv = pkgs.cryptsetup; path = "bin/veritysetup"; }
diff --git a/lib/make-sysext.nix b/lib/make-sysext.nix
index c94227b..6de1e63 100644
--- a/lib/make-sysext.nix
+++ b/lib/make-sysext.nix
@@ -63,7 +63,7 @@ runCommand name
cp -Pv "$srcfile" "$destfile"
chmod 755 "$destfile"
- patchelf --set-rpath /usr/lib $destfile
+ patchelf --set-rpath /usr/lib $destfile || true
patchelf --set-interpreter /lib/ld-linux-x86-64.so.2 $destfile || true
}