Revert "Add /run/nss to LD_LIBRARY_PATH".
Commit c948494342
exports too many shared
objects into the LD_LIBRARY_PATH, which causes problems with mplayer.
This commit is contained in:
parent
83e7689d02
commit
c5ba924143
@ -22,7 +22,6 @@ let
|
||||
{
|
||||
inherit list;
|
||||
path = makeLibraryPath list;
|
||||
dir = pkgs.symlinkJoin "nss-modules" (map (p: "${p}/lib") list);
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -13,7 +13,7 @@ export __ETC_PROFILE_DONE=1
|
||||
|
||||
# Initialise a bunch of environment variables.
|
||||
export LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
|
||||
export LD_LIBRARY_PATH=/run/nss:/run/opengl-driver/lib:/run/opengl-driver-32/lib # !!! only set if needed
|
||||
export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib # !!! only set if needed
|
||||
export NIXPKGS_CONFIG=/etc/nix/nixpkgs-config.nix
|
||||
export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs:nixos=/etc/nixos/nixos:nixos-config=/etc/nixos/configuration.nix:services=/etc/nixos/services
|
||||
export PAGER="less -R"
|
||||
|
@ -150,11 +150,6 @@ in
|
||||
${pkgs.utillinux}/bin/mount -o "remount,size=${config.boot.runSize}" none /run
|
||||
'';
|
||||
|
||||
system.activationScripts.nss =
|
||||
''
|
||||
ln -sfn ${config.system.nssModules.dir} /run/nss
|
||||
'';
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user