Merge pull request #56744 from matthewbauer/macos-10-12
Update macOS to 10.12
This commit is contained in:
@@ -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`,
|
||||
|
||||
@@ -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";
|
||||
|
||||
Reference in New Issue
Block a user