From 29b62e07d66c6ee14c8b9a3428e413fc4dc1c223 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 14 May 2018 22:28:37 -0400 Subject: pam: Remove crossAttrs It turns out none of this stuff is needed. The docs aren't evenly built properly anyways so the build trivially succeeds either way, due to what looks like upstream misunderstanding automake. If I try to build the docs manually in a cross shell (before and after this change), there's a make rule error such that some HTML files aren't even attempted to be built and then a copy fails. Even if this was all fixed, these been a good number of cross fixes upstream getting them to use CC_FOR_BUILD and other good stuff, so I doubt such hacks would be needed. Progress towards #40531 and #33302. --- pkgs/os-specific/linux/pam/default.nix | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'pkgs/os-specific/linux/pam/default.nix') diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 5f92dfcc839..e2d34abb70c 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 -- cgit 1.4.1