buildFHSEnv: symlink libexec into the FHS tree (#328685)

NixOS · Dec 2, 2024 · 7df3282 · 7df3282
2 parents 2c15aa5 + 3cf4fac
commit 7df3282
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -159,7 +159,7 @@ fn collect_candidate_paths(
 }
 
 fn remap_native_path(root: &Path, p: &Path) -> Option<PathBuf> {
-    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));
     }