diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-01-06 16:32:47 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-01-06 16:32:47 +0100 |
| commit | 07bf828bd96591b302bd0a05edee48d2f4834efb (patch) | |
| tree | 22f053f5aaa4243c47d887237fa1f1d59b10d6f5 /pkgs/tools/misc | |
| parent | 99c8e8e71f734ebc48ac6d3e8a6ac3e760ca7529 (diff) | |
| parent | d442a0ffc0ad7e33fa0fddaf0365caf80193a224 (diff) | |
| download | nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.tar nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.tar.gz nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.tar.bz2 nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.tar.lz nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.tar.xz nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.tar.zst nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.zip | |
Merge branch 'staging'; security /cc #21642
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/misc/grub/2.0x.nix | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 8b39e3711e11..9e66c6ba9181 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, perl, xz, gmp ? null , aclSupport ? false, acl ? null +, attrSupport ? false, attr ? null , selinuxSupport? false, libselinux ? null, libsepol ? null , autoconf, automake114x, texinfo , withPrefix ? false @@ -44,12 +45,14 @@ let buildInputs = [ gmp ] ++ optional aclSupport acl + ++ optional attrSupport attr ++ optionals stdenv.isCygwin [ autoconf automake114x texinfo ] # due to patch ++ optionals selinuxSupport [ libselinux libsepol ]; crossAttrs = { buildInputs = [ gmp.crossDrv ] ++ optional aclSupport acl.crossDrv + ++ optional attrSupport attr.crossDrv ++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ] ++ optional (stdenv.ccCross.libc ? libiconv) stdenv.ccCross.libc.libiconv.crossDrv; @@ -90,8 +93,6 @@ let makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; - postFixup = ""; # FIXME: remove on next mass rebuild - meta = { homepage = http://www.gnu.org/software/coreutils/; description = "The basic file, shell and text manipulation utilities of the GNU operating system"; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 15b1740638e2..eef1ac472280 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -54,6 +54,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "all" ]; + # Work around a bug in the generated flex lexer (upstream flex bug?) + NIX_CFLAGS_COMPILE = "-Wno-error"; + preConfigure = '' for i in "tests/util/"*.in do |