public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from trunk up through r28790

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
This commit is contained in:
Shea Levy
2011-08-24 19:16:43 +00:00
parent 5d62c65d6e b58016b007
commit 4d70ba6cc9
2168 changed files with 42927 additions and 19027 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/coreutils/default.nix
+13 -4
View File
@@ -1,8 +1,11 @@
{ stdenv, fetchurl, aclSupport ? false, acl ? null, perl, gmp ? null}:
{ stdenv, fetchurl, perl, gmp ? null
, aclSupport ? false, acl ? null
, selinuxSupport? false, libselinux ? null, libsepol ? null }:
assert aclSupport -> acl != null;
assert selinuxSupport -> ( (libselinux != null) && (libsepol != null) );
stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
name = "coreutils-8.10";
src = fetchurl {
@@ -11,11 +14,16 @@ stdenv.mkDerivation rec {
};
buildNativeInputs = [ perl ];
buildInputs = [ gmp ] ++ stdenv.lib.optional aclSupport acl;
buildInputs = [ gmp ]
++ stdenv.lib.optional aclSupport acl
++ stdenv.lib.optional selinuxSupport libselinux
++ stdenv.lib.optional selinuxSupport libsepol;
crossAttrs = {
buildInputs = [ gmp ]
++ stdenv.lib.optional aclSupport acl.hostDrv
++ stdenv.lib.optional selinuxSupport libselinux.hostDrv
++ stdenv.lib.optional selinuxSupport libsepol.hostDrv
++ stdenv.lib.optional (stdenv.gccCross.libc ? libiconv)
stdenv.gccCross.libc.libiconv.hostDrv;
@@ -48,4 +56,5 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}
} // (if selinuxSupport then { NIX_LDFLAGS = "-lsepol"; } else { } ) )