Merge #153104: linux-pam: don't create dangling symlink during build

... into staging
This commit is contained in:
Vladimír Čunát 2022-01-09 10:20:36 +01:00
commit c3805ba16c
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 1 additions and 13 deletions

View File

@ -1035,7 +1035,7 @@ in
setuid = true;
owner = "root";
group = "root";
source = "${pkgs.pam}/sbin/unix_chkpwd.orig";
source = "${pkgs.pam}/bin/unix_chkpwd";
};
};

View File

@ -23,18 +23,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
postInstall = ''
mv -v $out/sbin/unix_chkpwd{,.orig}
ln -sv /run/wrappers/bin/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 = lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
# export ac_cv_search_crypt=no
# (taken from Alpine linux, apparently insecure but also doesn't build O:))