pyrox.dev
gnutar: make sure libiconv is linked
gnutar’s `configure` detects libiconv but fails to link it on Darwin.
+5
-8
pkgs/tools/archivers/gnutar/default.nix
+5
-8
pkgs/tools/archivers/gnutar/default.nix
···
17
17
sha256 = "sha256-TWL/NzQux67XSFNTI5MMfPlKz3HDWRiCsmp+pQ8+3BY=";
18
18
};
19
19
20
-
# avoid retaining reference to CF during stdenv bootstrap
21
-
configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [
22
-
"gt_cv_func_CFPreferencesCopyAppValue=no"
23
-
"gt_cv_func_CFLocaleCopyCurrent=no"
24
-
"gt_cv_func_CFLocaleCopyPreferredLanguages=no"
25
-
];
20
+
# GNU tar fails to link libiconv even though the configure script detects it.
21
+
# https://savannah.gnu.org/bugs/index.php?64441
22
+
patches = [ ./link-libiconv.patch ];
26
23
27
24
# gnutar tries to call into gettext between `fork` and `exec`,
28
25
# which is not safe on darwin.
···
33
30
34
31
outputs = [ "out" "info" ];
35
32
36
-
nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook
37
-
++ lib.optional (!stdenv.hostPlatform.isDarwin) updateAutotoolsGnuConfigScriptsHook;
33
+
nativeBuildInputs = [ autoreconfHook ];
34
+
38
35
# Add libintl on Darwin specifically as it fails to link (or skip)
39
36
# NLS on it's own:
40
37
# "_libintl_textdomain", referenced from:
+23
pkgs/tools/archivers/gnutar/link-libiconv.patch
+23
pkgs/tools/archivers/gnutar/link-libiconv.patch
···
1
+
From 8632df398b2f548465ebe68b8f494c0d6f8d913d Mon Sep 17 00:00:00 2001
2
+
From: Sergey Poznyakoff <gray@gnu.org>
3
+
Date: Tue, 18 Jul 2023 17:02:23 +0300
4
+
Subject: Fix savannah bug #64441
5
+
6
+
* src/Makefile.am (tar_LDADD): Add libiconv libraries.
7
+
---
8
+
src/Makefile.am | 3 ++-
9
+
1 file changed, 2 insertions(+), 1 deletion(-)
10
+
11
+
diff --git a/src/Makefile.am b/src/Makefile.am
12
+
index 36c9543..e2ec58d 100644
13
+
--- a/src/Makefile.am
14
+
+++ b/src/Makefile.am
15
+
@@ -52,4 +52,5 @@ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
16
+
tar_LDADD = $(LIBS) ../lib/libtar.a ../gnu/libgnu.a\
17
+
$(LIB_ACL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS)\
18
+
$(LIB_GETRANDOM) $(LIB_HARD_LOCALE) $(FILE_HAS_ACL_LIB) $(LIB_MBRTOWC)\
19
+
- $(LIB_SELINUX) $(LIB_SETLOCALE_NULL)
20
+
+ $(LIB_SELINUX) $(LIB_SETLOCALE_NULL) \
21
+
+ $(LIBINTL) $(LIBICONV)
22
+
--
23
+
cgit v1.1