git.iko.soy/typeable/nixpkgs
on master help sign in
fhs-bubblewrap: mount cache on 32 bit glibc too
commitbaaec2953107ac991b21aca9ea3892d9ab8cd5e5 authorLuigi Sartor Piucco <luigipiucco@gmail.com> dateWed 3 Feb 2021, 22:16 (6 years ago) parentbdd9027
1 file changed+6−1
pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix+6−1
pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix+6−1
@@ -1,4 +1,4 @@
1−{ lib, callPackage, runCommandLocal, writeShellScriptBin, glibc, coreutils, bubblewrap }:
1+{ lib, callPackage, runCommandLocal, writeShellScriptBin, glibc, pkgsi686Linux, coreutils, bubblewrap }:
22
33let buildFHSEnv = callPackage ./env.nix { }; in
44
@@ -143,6 +143,11 @@ let
143143 --symlink /etc/ld.so.cache ${glibc}/etc/ld.so.cache \
144144 --ro-bind ${glibc}/etc/rpc ${glibc}/etc/rpc \
145145 --remount-ro ${glibc}/etc \
146+ --tmpfs ${pkgsi686Linux.glibc}/etc \
147+ --symlink /etc/ld.so.conf ${pkgsi686Linux.glibc}/etc/ld.so.conf \
148+ --symlink /etc/ld.so.cache ${pkgsi686Linux.glibc}/etc/ld.so.cache \
149+ --ro-bind ${pkgsi686Linux.glibc}/etc/rpc ${pkgsi686Linux.glibc}/etc/rpc \
150+ --remount-ro ${pkgsi686Linux.glibc}/etc \
146151 ${etcBindFlags}
147152 "''${ro_mounts[@]}"
148153 "''${symlinks[@]}"