tjh.dev
mldonkey: fix build with gettext 0.25
+7
pkgs/applications/networking/p2p/mldonkey/default.nix
+7
pkgs/applications/networking/p2p/mldonkey/default.nix
···
20
hash = "sha256-Dbb7163CdqHY7/FJY2yWBFRudT+hTFT6fO4sFgt6C/A=";
21
};
22
23
postPatch = ''
24
substituteInPlace config/Makefile.in \
25
--replace-fail '+camlp4' '${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4'
···
56
# https://github.com/ygrek/mldonkey/issues/117
57
// lib.optionalAttrs stdenv.cc.isClang {
58
CXXFLAGS = "-std=c++98";
59
};
60
61
meta = {
···
20
hash = "sha256-Dbb7163CdqHY7/FJY2yWBFRudT+hTFT6fO4sFgt6C/A=";
21
};
22
23
+
patches = [
24
+
./gettext-0.25.patch
25
+
];
26
+
27
postPatch = ''
28
substituteInPlace config/Makefile.in \
29
--replace-fail '+camlp4' '${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4'
···
60
# https://github.com/ygrek/mldonkey/issues/117
61
// lib.optionalAttrs stdenv.cc.isClang {
62
CXXFLAGS = "-std=c++98";
63
+
}
64
+
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
65
+
NIX_LDFLAGS = "-liconv";
66
};
67
68
meta = {
+14
pkgs/applications/networking/p2p/mldonkey/gettext-0.25.patch
+14
pkgs/applications/networking/p2p/mldonkey/gettext-0.25.patch
···
···
1
+
diff --git a/config/configure.in b/config/configure.in
2
+
index f2dd838b..e1b5ed47 100644
3
+
--- a/config/configure.in
4
+
+++ b/config/configure.in
5
+
@@ -10,6 +10,9 @@ AC_CONFIG_SRCDIR([Makefile.config.in])
6
+
AC_CONFIG_HEADER(config.h)
7
+
AC_CONFIG_MACRO_DIR([m4])
8
+
9
+
+AM_GNU_GETTEXT_VERSION([0.25])
10
+
+AM_GNU_GETTEXT([external])
11
+
+
12
+
CONFIGURE_RUN=yes
13
+
CONFIGURE_ARGUMENTS=$ac_configure_args
14
+
echo "Arguments to configure: $CONFIGURE_ARGUMENTS"