From 5200c92aa0219b5c8fff31f82488a37e865782f7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 15:56:41 +0100 Subject: libxcrypt: Remove --- pkgs/os-specific/linux/pam/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'pkgs/os-specific/linux/pam') diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 112c82d1ea0..43300425c00 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, cracklib, libxcrypt }: +{ stdenv, fetchurl, flex, cracklib }: stdenv.mkDerivation rec { name = "linux-pam-1.1.6"; @@ -10,13 +10,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex ]; - buildInputs = [ cracklib ] - ++ stdenv.lib.optional - (!stdenv.isArm && stdenv.system != "mips64el-linux") - libxcrypt; + buildInputs = [ cracklib ]; crossAttrs = { - # Skip libxcrypt cross-building, as it fails for mips and arm propagatedBuildInputs = [ flex.crossDrv cracklib.crossDrv ]; preConfigure = preConfigure + '' ar x ${flex.crossDrv}/lib/libfl.a -- cgit 1.4.1