From 3cf4fac9258ecd366c5160783c58fa98c6865338 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Sat, 20 Jul 2024 15:04:13 +0200 Subject: [PATCH] buildFHSEnv: symlink libexec into the FHS tree --- pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix | 1 + .../build-fhsenv-bubblewrap/rootfs-builder/src/main.rs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index dc8ee68e8783..d2d931d00752 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -196,6 +196,7 @@ let ln -s /usr/lib32 $out/lib32 ln -s /usr/lib64 $out/lib64 ln -s /usr/lib64 $out/usr/lib + ln -s /usr/libexec $out/libexec # symlink 32-bit ld-linux so it's visible in /lib if [ -e $out/usr/lib32/ld-linux.so.2 ]; then diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/rootfs-builder/src/main.rs b/pkgs/build-support/build-fhsenv-bubblewrap/rootfs-builder/src/main.rs index f765a96d3e08..4aebfe276520 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/rootfs-builder/src/main.rs +++ b/pkgs/build-support/build-fhsenv-bubblewrap/rootfs-builder/src/main.rs @@ -159,7 +159,7 @@ fn collect_candidate_paths( } fn remap_native_path(root: &Path, p: &Path) -> Option { - if p.starts_with("bin/") || p.starts_with("sbin/") { + if p.starts_with("bin/") || p.starts_with("sbin/") || p.starts_with("libexec/") { return Some(PathBuf::from("usr/").join(p)); }