[WIP] fhs-userenv-bubblewrap: Support ld.so.conf/cache #102178
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -1,4 +1,4 @@ | |||
| { callPackage, runCommandLocal, writeShellScriptBin, stdenv, coreutils, bubblewrap }: | |||
| { callPackage, runCommandLocal, writeShellScriptBin, stdenv, pkgs, coreutils, bubblewrap }: | |||
There was a problem hiding this comment.
Please don't include pkgs but glibc.
| @@ -38,9 +38,10 @@ let | |||
| # these match the host's architecture, glibc_multi is used for multilib | |||
| # builds. glibcLocales must be before glibc or glibc_multi as otherwiese | |||
| # the wrong LOCALE_ARCHIVE will be used where only C.UTF-8 is available. | |||
| glibc = with pkgs; (if isMultiBuild then glibc_multi else glibc); | |||
There was a problem hiding this comment.
I think the infinit recursion is occurring here. Can the pkgs be removed and glibc added directly?
Preserve top-level symlinks such as /lib -> /usr/lib. This allows nested containers such as Steam's new runtime to remount /usr if they need to and then run unmodified binaries that reference e.g. /lib/ld-linux-x86-64.so.2 Before, we would mount the fully resolved host directory at /lib and thus the dynamic loader would always be the one from the host filesystem.
10 tasks
|
superseded by #114024 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
This is an effort to fix compatibility with the new steam runtime. See also #100655
There are currently 2 parts to this:
bin-->usr/bin, ...). This is to allow things like bind-mounting another/usrinside to work like they would on another distribution with a "usr-merge" implemented and also overwrite the things in/bin./etc/ld.so.confand/etc/ld.so.cacheto function with our glibc. This should make our current setting ofLD_LIBRARY_PATHobsolete as well and improves compatibility e.g. with games that incorrectly overwrite that instead of appending to it.There is still a bit more testing needed until the linked issue is fully resolved. However as far as I can currently tell these changes are all that is necessarily NixOS specific.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)