Merge pull request #116 from rickynils/nss

Add /run/nss to LD_LIBRARY_PATH
This commit is contained in:
Peter Simons 2013-03-13 02:57:32 -07:00
commit 8f679fef5b
3 changed files with 7 additions and 1 deletions

View file

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

View file

@ -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/opengl-driver/lib:/run/opengl-driver-32/lib # !!! only set if needed
export LD_LIBRARY_PATH=/run/nss:/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"

View file

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