From 9b2bd7479f4376292fd66cee36fed4d12498f31c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 19 Nov 2011 18:28:16 +0000 Subject: [PATCH] Shadow: Make Linux-PAM optional; allow cross-compilation. svn path=/nixpkgs/trunk/; revision=30482 --- pkgs/os-specific/linux/shadow/default.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index e4722f26d2b6..fec9fe3da611 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,22 +1,31 @@ -{ stdenv, fetchurl, pam, glibc }: - +{ stdenv, fetchurl, pam ? null, glibcCross ? null }: + +let + glibc = if stdenv ? cross + then glibcCross + else stdenv.glibc; +in stdenv.mkDerivation rec { name = "shadow-4.1.4.2"; - + src = fetchurl { url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.bz2"; sha256 = "1449ny7pdnwkavg92wvibapnkgdq5pas38nvl1m5xa37g5m7z64p"; }; - buildInputs = [ pam ]; + buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam; patches = [ ./no-sanitize-env.patch ./su-name.patch ./keep-path.patch ]; - preBuild = + # Assume System V `setpgrp (void)', which is the default on GNU variants + # (`AC_FUNC_SETPGRP' is not cross-compilation capable.) + preConfigure = "export ac_cv_func_setpgrp_void=yes"; + + preBuild = assert glibc != null; '' substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc}/sbin/nscd ''; - + meta = { homepage = http://pkg-shadow.alioth.debian.org/; description = "Suite containing authentication-related tools such as passwd and su";