Skip to content

Commit 0715ef5

Browse files
committed
linux-pam: don't create dangling symlink during build
1 parent dcab2ec commit 0715ef5

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

nixos/modules/security/pam.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@ in
10351035
setuid = true;
10361036
owner = "root";
10371037
group = "root";
1038-
source = "${pkgs.pam}/sbin/unix_chkpwd.orig";
1038+
source = "${pkgs.pam}/sbin/unix_chkpwd";
10391039
};
10401040
};
10411041

pkgs/os-specific/linux/pam/default.nix

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,6 @@ stdenv.mkDerivation rec {
2323

2424
enableParallelBuilding = true;
2525

26-
postInstall = ''
27-
mv -v $out/sbin/unix_chkpwd{,.orig}
28-
ln -sv /run/wrappers/bin/unix_chkpwd $out/sbin/unix_chkpwd
29-
''; /*
30-
rm -rf $out/etc
31-
mkdir -p $modules/lib
32-
mv $out/lib/security $modules/lib/
33-
'';*/
34-
# don't move modules, because libpam needs to (be able to) find them,
35-
# which is done by dlopening $out/lib/security/pam_foo.so
36-
# $out/etc was also missed: pam_env(login:session): Unable to open config file
37-
3826
preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
3927
# export ac_cv_search_crypt=no
4028
# (taken from Alpine linux, apparently insecure but also doesn't build O:))

0 commit comments

Comments
 (0)