From c911c64f9b08fb5a4709211911e2ee3b149c550c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 27 Sep 2010 08:48:28 +0000 Subject: [PATCH] libcap: with pam, just set prefix and lib svn path=/nixpkgs/branches/stdenv-updates/; revision=23960 --- pkgs/os-specific/linux/libcap/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index c09ab22576f..8185fac3ccf 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, attr, perl}: +{stdenv, fetchurl, attr, perl, pam}: assert stdenv.isLinux; @@ -11,9 +11,7 @@ stdenv.mkDerivation { }; buildNativeInputs = [perl]; - buildInputs = [attr]; + buildInputs = [attr pam]; - preBuild = '' - makeFlagsArray=(LIBDIR=$out/lib INCDIR=$out/include SBINDIR=$out/sbin MANDIR=$out/man PAM_CAP=no) - ''; + makeFlags = "PAM_CAP=yes lib=lib prefix=$(out)"; }