diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-26 22:20:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-26 22:20:03 -0400 |
| commit | 87944c3125c4e69a69e76003c0ed5bf47bf0c4d8 (patch) | |
| tree | 6c6e4f084e2ed6567719d44b4dd377829cd2c6f8 /pkgs/tools/archivers | |
| parent | 1cf626ce29f154c5742196327e03dbd61d0ed988 (diff) | |
| parent | c1f1a0ea159a4513be524fa775ad708debd19aa1 (diff) | |
Merge pull request #56744 from matthewbauer/macos-10-12
Update macOS to 10.12
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/gnutar/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/archivers/p7zip/default.nix | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index b64696a34202..c2e7f75fc7fc 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionals stdenv.isDarwin [ "gt_cv_func_CFPreferencesCopyAppValue=no" "gt_cv_func_CFLocaleCopyCurrent=no" + "gt_cv_func_CFLocaleCopyPreferredLanguages=no" ]; # gnutar tries to call into gettext between `fork` and `exec`, diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 5430c2cb73e7..3dac4245de4e 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; + NIX_CFLAGS_COMPILE = "-Wno-error=c++11-narrowing"; + meta = { homepage = http://p7zip.sourceforge.net/; description = "A port of the 7-zip archiver"; |