diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-01-09 10:20:36 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-01-09 10:26:43 +0100 |
| commit | c3805ba16cf4a060cdbb82d4ce21b74f9989dbb8 (patch) | |
| tree | e929f1250601b657f8a0398f431b52a8c654d924 | |
| parent | 77f02854488a9bf8ef7db1a28d57e616d3424bcd (diff) | |
| parent | 0715ef59683a2f8091c7c4edceaff8d892ac1707 (diff) | |
| download | nixpkgs-c3805ba16cf4a060cdbb82d4ce21b74f9989dbb8.tar nixpkgs-c3805ba16cf4a060cdbb82d4ce21b74f9989dbb8.tar.gz nixpkgs-c3805ba16cf4a060cdbb82d4ce21b74f9989dbb8.tar.bz2 nixpkgs-c3805ba16cf4a060cdbb82d4ce21b74f9989dbb8.tar.lz nixpkgs-c3805ba16cf4a060cdbb82d4ce21b74f9989dbb8.tar.xz nixpkgs-c3805ba16cf4a060cdbb82d4ce21b74f9989dbb8.tar.zst nixpkgs-c3805ba16cf4a060cdbb82d4ce21b74f9989dbb8.zip | |
Merge #153104: linux-pam: don't create dangling symlink during build
... into staging
| -rw-r--r-- | nixos/modules/security/pam.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pam/default.nix | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 0944b36c6d1..6c1da075a86 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -1035,7 +1035,7 @@ in setuid = true; owner = "root"; group = "root"; - source = "${pkgs.pam}/sbin/unix_chkpwd.orig"; + source = "${pkgs.pam}/bin/unix_chkpwd"; }; }; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 12ff9f493a3..33ab4f784fc 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -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:)) |