summary refs log tree commit diff
path: root/pkgs/os-specific/linux/pam/default.nix
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2018-05-14 22:28:37 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-05-14 22:28:37 -0400
commit29b62e07d66c6ee14c8b9a3428e413fc4dc1c223 (patch)
tree698f5ef05a5ca8a6d50920e2f3ae12b3a5578f24 /pkgs/os-specific/linux/pam/default.nix
parent84868b8b06e54f0d1a9eb3140ed80b4d697f35d3 (diff)
downloadnixpkgs-29b62e07d66c6ee14c8b9a3428e413fc4dc1c223.tar
nixpkgs-29b62e07d66c6ee14c8b9a3428e413fc4dc1c223.tar.gz
nixpkgs-29b62e07d66c6ee14c8b9a3428e413fc4dc1c223.tar.bz2
nixpkgs-29b62e07d66c6ee14c8b9a3428e413fc4dc1c223.tar.lz
nixpkgs-29b62e07d66c6ee14c8b9a3428e413fc4dc1c223.tar.xz
nixpkgs-29b62e07d66c6ee14c8b9a3428e413fc4dc1c223.tar.zst
nixpkgs-29b62e07d66c6ee14c8b9a3428e413fc4dc1c223.zip
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.
Diffstat (limited to 'pkgs/os-specific/linux/pam/default.nix')
-rw-r--r--pkgs/os-specific/linux/pam/default.nix15
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 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