diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-14 22:53:10 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-14 22:53:10 -0400 |
commit | f2017c40ae33c9d39f9decaaea4b9701d7e681d8 (patch) | |
tree | f870e4c0a5733e6b9431ef7961cc7662f7777b8f /pkgs/os-specific/linux/pam | |
parent | 8a70c71c979d5fe2f4b9b5592b195b5a7b5c1c38 (diff) | |
parent | fd5ca417f2d6f3bd3a82c963ad71919912856da0 (diff) | |
download | nixpkgs-f2017c40ae33c9d39f9decaaea4b9701d7e681d8.tar nixpkgs-f2017c40ae33c9d39f9decaaea4b9701d7e681d8.tar.gz nixpkgs-f2017c40ae33c9d39f9decaaea4b9701d7e681d8.tar.bz2 nixpkgs-f2017c40ae33c9d39f9decaaea4b9701d7e681d8.tar.lz nixpkgs-f2017c40ae33c9d39f9decaaea4b9701d7e681d8.tar.xz nixpkgs-f2017c40ae33c9d39f9decaaea4b9701d7e681d8.tar.zst nixpkgs-f2017c40ae33c9d39f9decaaea4b9701d7e681d8.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/os-specific/linux/pam')
-rw-r--r-- | pkgs/os-specific/linux/pam/default.nix | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 1db1a493ae2..0e703397249 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -33,21 +33,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - crossAttrs = { - propagatedBuildInputs = [ flex.crossDrv cracklib.crossDrv ]; - preConfigure = preConfigure + '' - $crossConfig-ar x ${flex.crossDrv}/lib/libfl.a - mv libyywrap.o libyywrap-target.o - ar x ${flex}/lib/libfl.a - mv libyywrap.o libyywrap-host.o - export LDFLAGS="$LDFLAGS $PWD/libyywrap-target.o" - sed -e 's/@CC@/gcc/' -i doc/specs/Makefile.in - ''; - postConfigure = '' - sed -e "s@ $PWD/libyywrap-target.o@ $PWD/libyywrap-host.o@" -i doc/specs/Makefile - ''; - }; - postInstall = '' mv -v $out/sbin/unix_chkpwd{,.orig} ln -sv /run/wrappers/bin/unix_chkpwd $out/sbin/unix_chkpwd |