ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 08:59:32 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #76718 from matthewbauer/fix-etc-sconfigdir

Browse Source 
linux-pam: set sconfigdir to /etc for usage at runtime
This commit is contained in:
Matthew Bauer 2020-01-07 00:22:43 -05:00 committed by GitHub
commit 7743eba511
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/os-specific/linux/pam/default.nix
View File

@ -44,9 +44,7 @@ stdenv.mkDerivation rec {
# 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 = ''
configureFlags="$configureFlags --includedir=$out/include/security"
'' + stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
# export ac_cv_search_crypt=no
# (taken from Alpine linux, apparently insecure but also doesn't build O:))
# disable insecure modules
@ -54,6 +52,15 @@ stdenv.mkDerivation rec {
sed -e 's/pam_rhosts//g' -i modules/Makefile.in
'';
configureFlags = [
"--includedir=${placeholder "out"}/include/security"
"--enable-sconfigdir=/etc/security"
];
installFlags = [
"SCONFIGDIR=${placeholder "out"}/etc/security"
];
doCheck = false; # fails
meta = with stdenv.lib; {