diff options
| author | Jude Taylor <me@jude.bio> | 2015-06-11 17:58:26 -0700 |
|---|---|---|
| committer | Jude Taylor <me@jude.bio> | 2015-06-18 12:37:41 -0700 |
| commit | fa9c81f69468098e0dd0ca79ea4d2ef74ec6bc0c (patch) | |
| tree | 3488761b783cedf8a7c90f1a51c1435430c35cd4 /pkgs/tools | |
| parent | 5e63669520dc1ac22a16ddd7fef468f38ca0b221 (diff) | |
| download | nixlib-fa9c81f69468098e0dd0ca79ea4d2ef74ec6bc0c.tar nixlib-fa9c81f69468098e0dd0ca79ea4d2ef74ec6bc0c.tar.gz nixlib-fa9c81f69468098e0dd0ca79ea4d2ef74ec6bc0c.tar.bz2 nixlib-fa9c81f69468098e0dd0ca79ea4d2ef74ec6bc0c.tar.lz nixlib-fa9c81f69468098e0dd0ca79ea4d2ef74ec6bc0c.tar.xz nixlib-fa9c81f69468098e0dd0ca79ea4d2ef74ec6bc0c.tar.zst nixlib-fa9c81f69468098e0dd0ca79ea4d2ef74ec6bc0c.zip | |
pure darwin stdenv
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/archivers/gnutar/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/archivers/sharutils/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/gawk/default.nix | 11 |
3 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 00be39677689..71b43bf2de9a 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.isDarwin ./gnutar-1.28-darwin.patch; + # avoid retaining reference to CF during stdenv bootstrap + configureFlags = stdenv.lib.optionals stdenv.isDarwin [ + "gt_cv_func_CFPreferencesCopyAppValue=no" + "gt_cv_func_CFLocaleCopyCurrent=no" + ]; + # gnutar tries to call into gettext between `fork` and `exec`, # which is not safe on darwin. # see http://article.gmane.org/gmane.os.macosx.fink.devel/21882 diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index 146f9bea87a0..bfeda5085b68 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { '' # Fix for building on Glibc 2.16. Won't be needed once the # gnulib in sharutils is updated. - sed -i ${stdenv.lib.optionalString ((stdenv.isFreeBSD || stdenv.isOpenBSD || stdenv.isDarwin) && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h + sed -i ${stdenv.lib.optionalString ((stdenv.isFreeBSD || stdenv.isOpenBSD) && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h ''; # GNU Gettext is needed on non-GNU platforms. diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index c6eb7ba11019..001a50458e29 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, libsigsegv, readline, readlineSupport ? false }: +{ stdenv, fetchurl, libsigsegv, readline, readlineSupport ? false +, locale ? null }: stdenv.mkDerivation rec { name = "gawk-4.1.3"; @@ -8,10 +9,14 @@ stdenv.mkDerivation rec { sha256 = "09d6pmx6h3i2glafm0jd1v1iyrs03vcyv2rkz12jisii3vlmbkz3"; }; - doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1 + doCheck = !( + stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1 + || stdenv.isDarwin # XXX: `locale' segfaults + ); buildInputs = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv - ++ stdenv.lib.optional readlineSupport readline; + ++ stdenv.lib.optional readlineSupport readline + ++ stdenv.lib.optional stdenv.isDarwin locale; configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}" ++ stdenv.lib.optional readlineSupport "--with-readline=${readline}" |