diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-01-29 00:02:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-29 00:02:04 +0000 |
| commit | 189be4ddc104fbb372f33ded7d8a43e1803a49b9 (patch) | |
| tree | 983225a8b907c3164677a6bf688b22c5bc887e96 /pkgs/os-specific/linux/pam | |
| parent | 3ecbb12aa1e83061613a10593b3741bf6e4a29a9 (diff) | |
| parent | 0c0f31bf510e7253aef56037e6cc2ddf51a23301 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux/pam')
| -rw-r--r-- | pkgs/os-specific/linux/pam/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pam/suid-wrapper-path.patch | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 54184a990fe59..1476ae49006ce 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-5OxxMakdpEUSV0Jo9JPG2MoQXIcJFpG46bVspoXU+U0="; }; + patches = [ ./suid-wrapper-path.patch ]; + outputs = [ "out" "doc" "man" /* "modules" */ ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/os-specific/linux/pam/suid-wrapper-path.patch b/pkgs/os-specific/linux/pam/suid-wrapper-path.patch new file mode 100644 index 0000000000000..71533c51a1902 --- /dev/null +++ b/pkgs/os-specific/linux/pam/suid-wrapper-path.patch @@ -0,0 +1,6 @@ +It needs the SUID version during runtime, and that can't be in /nix/store/** +--- a/modules/pam_unix/Makefile.in ++++ b/modules/pam_unix/Makefile.in +@@ -651 +651 @@ +- -DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" \ ++ -DCHKPWD_HELPER=\"/run/wrappers/bin/unix_chkpwd\" \ |