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

Merge #21661: coreutils: build with xattr support

This commit is contained in:
Vladimír Čunát 2017-01-05 00:18:43 +01:00
parent be489cf48c bde8632106
commit 6f2840c158
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
View File

@ -87,8 +87,9 @@ rec {
coreutilsMinimal = (pkgs.coreutils.override (args: { coreutilsMinimal = (pkgs.coreutils.override (args: {
# We want coreutils without ACL support. # We want coreutils without ACL/attr support.
aclSupport = false; aclSupport = false;
attrSupport = false;
# Our tooling currently can't handle scripts in bin/, only ELFs and symlinks. # Our tooling currently can't handle scripts in bin/, only ELFs and symlinks.
singleBinary = "symlinks"; singleBinary = "symlinks";
})).crossDrv; })).crossDrv;

3
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -6,8 +6,9 @@ rec {
coreutilsMinimal = coreutils.override (args: { coreutilsMinimal = coreutils.override (args: {
# We want coreutils without ACL support. # We want coreutils without ACL/attr support.
aclSupport = false; aclSupport = false;
attrSupport = false;
# Our tooling currently can't handle scripts in bin/, only ELFs and symlinks. # Our tooling currently can't handle scripts in bin/, only ELFs and symlinks.
singleBinary = "symlinks"; singleBinary = "symlinks";
}); });

5
pkgs/tools/misc/coreutils/default.nix
View File

@ -1,5 +1,6 @@
{ lib, stdenv, fetchurl, perl, xz, gmp ? null { lib, stdenv, fetchurl, perl, xz, gmp ? null
, aclSupport ? false, acl ? null , aclSupport ? false, acl ? null
, attrSupport ? false, attr ? null
, selinuxSupport? false, libselinux ? null, libsepol ? null , selinuxSupport? false, libselinux ? null, libsepol ? null
, autoconf, automake114x, texinfo , autoconf, automake114x, texinfo
, withPrefix ? false , withPrefix ? false
@ -44,12 +45,14 @@ let
buildInputs = [ gmp ] buildInputs = [ gmp ]
++ optional aclSupport acl ++ optional aclSupport acl
++ optional attrSupport attr
++ optionals stdenv.isCygwin [ autoconf automake114x texinfo ] # due to patch ++ optionals stdenv.isCygwin [ autoconf automake114x texinfo ] # due to patch
++ optionals selinuxSupport [ libselinux libsepol ]; ++ optionals selinuxSupport [ libselinux libsepol ];
crossAttrs = { crossAttrs = {
buildInputs = [ gmp.crossDrv ] buildInputs = [ gmp.crossDrv ]
++ optional aclSupport acl.crossDrv ++ optional aclSupport acl.crossDrv
++ optional attrSupport attr.crossDrv
++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ] ++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ]
++ optional (stdenv.ccCross.libc ? libiconv) ++ optional (stdenv.ccCross.libc ? libiconv)
stdenv.ccCross.libc.libiconv.crossDrv; stdenv.ccCross.libc.libiconv.crossDrv;
@ -90,8 +93,6 @@ let
makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0";
postFixup = ""; # FIXME: remove on next mass rebuild
meta = { meta = {
homepage = http://www.gnu.org/software/coreutils/; homepage = http://www.gnu.org/software/coreutils/;
description = "The basic file, shell and text manipulation utilities of the GNU operating system"; description = "The basic file, shell and text manipulation utilities of the GNU operating system";

1
pkgs/top-level/all-packages.nix
View File

@ -1287,6 +1287,7 @@ in
coreutils = callPackage ../tools/misc/coreutils { coreutils = callPackage ../tools/misc/coreutils {
aclSupport = stdenv.isLinux; aclSupport = stdenv.isLinux;
attrSupport = stdenv.isLinux;
}; };
coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; }; coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; };