From 27313767b8ed680d1dcfcfc0cb87c81562bba605 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 14 Nov 2019 18:07:23 +0100 Subject: [PATCH] gettext: fix darwin build The CF configure flags broke with the last update but based on fa9c81f69468098e0dd0ca79ea4d2ef74ec6bc0c and the comment it seems like these are not necessary anymore. $ nix-build -A stdenv.__bootPackages.stdenv.__bootPackages.gettext /nix/store/dii9p8717rjnbzar4kh1q3sxk77dbbkd-gettext-0.20.1 $ nix-store -qR /nix/store/dii9p8717rjnbzar4kh1q3sxk77dbbkd-gettext-0.20.1 /nix/store/2ws9cmamvr7xyvdg4d2nnd1bmr1zjrrq-bootstrap-tools /nix/store/2yn28axagwyifnvdm8npy2f982jxr986-libiconv-osx-10.12.6 /nix/store/dii9p8717rjnbzar4kh1q3sxk77dbbkd-gettext-0.20.1 --- pkgs/development/libraries/gettext/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 3c1e98730fa1..157f801d2f2f 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -21,10 +21,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-csharp" "--with-xz" - # avoid retaining reference to CF during stdenv bootstrap - ] ++ lib.optionals stdenv.isDarwin [ - "gt_cv_func_CFPreferencesCopyAppValue=no" - "gt_cv_func_CFLocaleCopyCurrent=no" ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # On cross building, gettext supposes that the wchar.h from libc # does not fulfill gettext needs, so it tries to work with its