From c5ba92414316ffe65c30a212f7af40f539bb7a53 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Mar 2013 11:25:25 +0100 Subject: [PATCH] Revert "Add /run/nss to LD_LIBRARY_PATH". Commit c948494342581e7c31880c1d3f2a3f9e618bc963 exports too many shared objects into the LD_LIBRARY_PATH, which causes problems with mplayer. --- modules/config/nsswitch.nix | 1 - modules/programs/bash/profile.sh | 2 +- modules/system/activation/activation-script.nix | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/modules/config/nsswitch.nix b/modules/config/nsswitch.nix index b9838945aa86..7e989c163e36 100644 --- a/modules/config/nsswitch.nix +++ b/modules/config/nsswitch.nix @@ -22,7 +22,6 @@ let { inherit list; path = makeLibraryPath list; - dir = pkgs.symlinkJoin "nss-modules" (map (p: "${p}/lib") list); }; }; diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh index 83a2c6ffe9f3..5393a88d5ffe 100644 --- a/modules/programs/bash/profile.sh +++ b/modules/programs/bash/profile.sh @@ -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" diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix index e4bc84b49c02..dc0175632174 100644 --- a/modules/system/activation/activation-script.nix +++ b/modules/system/activation/activation-script.nix @@ -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 - ''; - }; }