From 71a67fc4a839781d5895033fe5db43bb945264f1 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 28 Mar 2024 17:52:59 -0400 Subject: libiconv: use --replace-fail instead of --replace --- pkgs/development/libraries/libiconv/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 44f4b025e50ef..ed162d115298c 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -37,12 +37,12 @@ stdenv.mkDerivation rec { + lib.optionalString enableDarwinABICompat '' for iconv_h_in in iconv.h.in iconv.h.build.in; do substituteInPlace "include/$iconv_h_in" \ - --replace "#define iconv libiconv" "" \ - --replace "#define iconv_close libiconv_close" "" \ - --replace "#define iconv_open libiconv_open" "" \ - --replace "#define iconv_open_into libiconv_open_into" "" \ - --replace "#define iconvctl libiconvctl" "" \ - --replace "#define iconvlist libiconvlist" "" + --replace-fail "#define iconv libiconv" "" \ + --replace-fail "#define iconv_close libiconv_close" "" \ + --replace-fail "#define iconv_open libiconv_open" "" \ + --replace-fail "#define iconv_open_into libiconv_open_into" "" \ + --replace-fail "#define iconvctl libiconvctl" "" \ + --replace-fail "#define iconvlist libiconvlist" "" done ''; -- cgit 1.4.1