From 5d26d83df227d295f27a8e7a140e7bfa9acd3353 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 26 Apr 2015 22:06:53 +0200 Subject: pam: don't split modules libpam seems to need a reference to the modules anyway. --- pkgs/os-specific/linux/pam/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'pkgs/os-specific/linux/pam/default.nix') diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 8423ea6f123..8aaba0d3d5d 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./CVE-2014-2583.patch ]; - outputs = [ "out" "doc" "man" "modules" ]; + outputs = [ "out" "doc" "man" /* "modules" */ ]; nativeBuildInputs = [ flex ]; @@ -36,12 +36,14 @@ stdenv.mkDerivation rec { postInstall = '' mv -v $out/sbin/unix_chkpwd{,.orig} ln -sv /var/setuid-wrappers/unix_chkpwd $out/sbin/unix_chkpwd - + ''; /* rm -rf $out/etc - mkdir -p $modules/lib mv $out/lib/security $modules/lib/ - ''; + '';*/ + # don't move modules, because libpam needs to (be able to) find them, + # which is done by dlopening $out/lib/security/pam_foo.so + # $out/etc was also missed: pam_env(login:session): Unable to open config file preConfigure = '' configureFlags="$configureFlags --includedir=$out/include/security" -- cgit 1.4.1