lol

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

authored by philiptaron.tngl.sh and committed by

GitHub 7df32823 2c15aa59

+2 -1
+1
pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
··· 196 196 ln -s /usr/lib32 $out/lib32 197 197 ln -s /usr/lib64 $out/lib64 198 198 ln -s /usr/lib64 $out/usr/lib 199 + ln -s /usr/libexec $out/libexec 199 200 200 201 # symlink 32-bit ld-linux so it's visible in /lib 201 202 if [ -e $out/usr/lib32/ld-linux.so.2 ]; then
+1 -1
pkgs/build-support/build-fhsenv-bubblewrap/rootfs-builder/src/main.rs
··· 159 159 } 160 160 161 161 fn remap_native_path(root: &Path, p: &Path) -> Option<PathBuf> { 162 - if p.starts_with("bin/") || p.starts_with("sbin/") { 162 + if p.starts_with("bin/") || p.starts_with("sbin/") || p.starts_with("libexec/") { 163 163 return Some(PathBuf::from("usr/").join(p)); 164 164 } 165 165