public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Add /run/nss to LD_LIBRARY_PATH".

Browse Source 
Commit c948494342581e7c31880c1d3f2a3f9e618bc963 exports too many shared
objects into the LD_LIBRARY_PATH, which causes problems with mplayer.
This commit is contained in:
Peter Simons 2013-03-21 11:25:25 +01:00
parent 83e7689d02
commit c5ba924143
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/config/nsswitch.nix
View File

@ -22,7 +22,6 @@ let
{ {
inherit list; inherit list;
path = makeLibraryPath list; path = makeLibraryPath list;
dir = pkgs.symlinkJoin "nss-modules" (map (p: "${p}/lib") list);
}; };
}; };

2
modules/programs/bash/profile.sh
View File

@ -13,7 +13,7 @@ export __ETC_PROFILE_DONE=1
# Initialise a bunch of environment variables. # Initialise a bunch of environment variables.
export LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive 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 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 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" export PAGER="less -R"

5
modules/system/activation/activation-script.nix
View File

@ -150,11 +150,6 @@ in
${pkgs.utillinux}/bin/mount -o "remount,size=${config.boot.runSize}" none /run ${pkgs.utillinux}/bin/mount -o "remount,size=${config.boot.runSize}" none /run
''; '';
system.activationScripts.nss =
''
ln -sfn ${config.system.nssModules.dir} /run/nss
'';
}; };
} }