diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-26 22:06:53 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-05-05 11:52:08 +0200 |
commit | 5d26d83df227d295f27a8e7a140e7bfa9acd3353 (patch) | |
tree | 8bd8adf8ac3434d18e5f4a5799c6f9c2a6688523 /pkgs/os-specific | |
parent | 3b9ef2c71b275c924c4b28caf2f8a765bfc75d14 (diff) | |
download | nixpkgs-5d26d83df227d295f27a8e7a140e7bfa9acd3353.tar nixpkgs-5d26d83df227d295f27a8e7a140e7bfa9acd3353.tar.gz nixpkgs-5d26d83df227d295f27a8e7a140e7bfa9acd3353.tar.bz2 nixpkgs-5d26d83df227d295f27a8e7a140e7bfa9acd3353.tar.lz nixpkgs-5d26d83df227d295f27a8e7a140e7bfa9acd3353.tar.xz nixpkgs-5d26d83df227d295f27a8e7a140e7bfa9acd3353.tar.zst nixpkgs-5d26d83df227d295f27a8e7a140e7bfa9acd3353.zip |
pam: don't split modules
libpam seems to need a reference to the modules anyway.
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/pam/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 8423ea6f123..8aaba0d3d5d 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./CVE-2014-2583.patch ]; - outputs = [ "out" "doc" "man" "modules" ]; + outputs = [ "out" "doc" "man" /* "modules" */ ]; nativeBuildInputs = [ flex ]; @@ -36,12 +36,14 @@ stdenv.mkDerivation rec { postInstall = '' mv -v $out/sbin/unix_chkpwd{,.orig} ln -sv /var/setuid-wrappers/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 = '' configureFlags="$configureFlags --includedir=$out/include/security" |