diff options
author | John Ericson <Ericson2314@yahoo.com> | 2018-05-14 22:52:47 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-14 22:52:47 -0400 |
commit | fd5ca417f2d6f3bd3a82c963ad71919912856da0 (patch) | |
tree | d5bc991b84ab271e63602be80646333e5d3432e4 | |
parent | 669f9453dc94c5ab24a425536b98c7f4d5cce359 (diff) | |
parent | 29b62e07d66c6ee14c8b9a3428e413fc4dc1c223 (diff) | |
download | nixlib-fd5ca417f2d6f3bd3a82c963ad71919912856da0.tar nixlib-fd5ca417f2d6f3bd3a82c963ad71919912856da0.tar.gz nixlib-fd5ca417f2d6f3bd3a82c963ad71919912856da0.tar.bz2 nixlib-fd5ca417f2d6f3bd3a82c963ad71919912856da0.tar.lz nixlib-fd5ca417f2d6f3bd3a82c963ad71919912856da0.tar.xz nixlib-fd5ca417f2d6f3bd3a82c963ad71919912856da0.tar.zst nixlib-fd5ca417f2d6f3bd3a82c963ad71919912856da0.zip |
Merge pull request #40537 from obsidiansystems/linux-pam-cross
pam: Remove crossAttrs
-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 5f92dfcc8390..e2d34abb70cc 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 |