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

... into staging

+1 -13
+1 -1
nixos/modules/security/pam.nix
··· 1035 1035 setuid = true; 1036 1036 owner = "root"; 1037 1037 group = "root"; 1038 - source = "${pkgs.pam}/sbin/unix_chkpwd.orig"; 1038 + source = "${pkgs.pam}/bin/unix_chkpwd"; 1039 1039 }; 1040 1040 }; 1041 1041
-12
pkgs/os-specific/linux/pam/default.nix
··· 23 23 24 24 enableParallelBuilding = true; 25 25 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 - 38 26 preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") '' 39 27 # export ac_cv_search_crypt=no 40 28 # (taken from Alpine linux, apparently insecure but also doesn't build O:))