summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuna Nova <git@lunnova.dev>2023-10-24 07:13:33 -0700
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-10-25 17:03:41 +0000
commit7c7c090218639ba8f82aeb5b79ce23a4ca705f46 (patch)
treee847d404590bbc0b57b1ea3791433180ca1f1785
parentMerge pull request #263243 from NixOS/backport-263180-to-release-23.05 (diff)
downloadnixpkgs-7c7c090218639ba8f82aeb5b79ce23a4ca705f46.tar.gz
build-fhsenv-bubblewrap: remove /usr/lib and /usr/lib32 from LD_LIBRARY_PATHorigin/backport-263201-to-release-23.05
See https://github.com/NixOS/nixpkgs/issues/262775 (cherry picked from commit a9600ce894573076f4fe9fda4f820c226f50dcd7)
-rw-r--r--pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
index 15504916af63..702e0ba01f54 100644
--- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
+++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
@@ -83,7 +83,7 @@ let
etcProfile = writeText "profile" ''
export PS1='${name}-chrootenv:\u@\h:\w\$ '
export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive'
- export LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
+ export LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH"
export TZDIR='/etc/zoneinfo'