Unverified Commit 7df32823 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

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

parents 2c15aa59 3cf4fac9

pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix

+1 −0
Original line number Diff line number Diff line
@@ -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

pkgs/build-support/build-fhsenv-bubblewrap/rootfs-builder/src/main.rs

+1 −1
Original line number Diff line number Diff line
@@ -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));

    }