diff options
| author | ash lea <example@thisismyactual.email> | 2022-08-02 11:05:33 -0400 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2022-08-02 13:48:34 -0700 |
| commit | 488056a418afdeeb73f583aae73b1e369912b363 (patch) | |
| tree | cc826326242d7593e97209655131279b488f82b1 /pkgs/build-support/build-fhs-userenv-bubblewrap | |
| parent | 4d6bee687bf0bb60d4755b32f0b03dbc8a32408d (diff) | |
steam: fix opengl inside pressure-vessel
Diffstat (limited to 'pkgs/build-support/build-fhs-userenv-bubblewrap')
| -rw-r--r-- | pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index e44519a04046d..f66ad38f7b86e 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -88,6 +88,8 @@ let /lib32 /usr/lib/i386-linux-gnu /usr/lib32 + /run/opengl-driver/lib + /run/opengl-driver-32/lib EOF ldconfig &> /dev/null ''; diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 945b9287ed00a..925dfc8bfbe2d 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -50,7 +50,8 @@ let ]; ldconfig = writeShellScriptBin "ldconfig" '' - exec ${pkgs.glibc.bin}/bin/ldconfig -f /etc/ld.so.conf -C /etc/ld.so.cache "$@" + # due to a glibc bug, 64-bit ldconfig complains about patchelf'd 32-bit libraries, so we're using 32-bit ldconfig + exec ${pkgsi686Linux.glibc.bin}/bin/ldconfig -f /etc/ld.so.conf -C /etc/ld.so.cache "$@" ''; etcProfile = writeText "profile" '' export PS1='${name}-chrootenv:\u@\h:\w\$ ' |