gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build-fhsenv-bubblewrap: fix /usr/lib to point to /usr/lib32 on i686-linux

Browse Source 
Without the change buildFHSEnv on "i686-linux" tries to link
/usr/lib to /usr/lib64. This causes problems for packages that assume
that /usr/lib contains actual libraries (like vanilla gcc build).

On "i686-linux" most libraries go to /usr/lib32. /usr/lib64 is virtually
empty (it should be completely, but let's leave it for another day).

As a result /usr/lib contains none of the expected libraries and FHS
programs fails to find them.

THe change makes "lib" dependent on `system` target.

Tested the change by building `gcc` on `x86_64-linux` and `i686-linux`.
Both still pass the build.
This commit is contained in:
Sergei Trofimovich
2025-12-06 21:27:42 +00:00
parent 300f2d4247
commit d151f99d0f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
+8 -1
View File
@@ -46,6 +46,13 @@ let
# "use of glibc_multi is only supported on x86_64-linux"
isMultiBuild = multiArch && stdenv.system == "x86_64-linux";
# What should lib be linked to: lib32 or lib64?
defaultLib =
{
"i686-linux" = "lib32";
"x86_64-linux" = "lib64";
}
.${stdenv.system} or (throw "Please expand list of system with defaultLib for '${stdenv.system}'");
# list of packages (usually programs) which match the host's architecture
# (which includes stuff from multiPkgs)
@@ -229,7 +236,7 @@ let
ln -s /usr/lib $out/lib
ln -s /usr/lib32 $out/lib32
ln -s /usr/lib64 $out/lib64
ln -s /usr/lib64 $out/usr/lib
ln -s /usr/${defaultLib} $out/usr/lib
ln -s /usr/libexec $out/libexec
# symlink 32-bit ld-linux so it's visible in /lib