Merge pull request #19767 from ajevans85/bug/19684_weechat_osx_res_9_init_build_failure
weechat: Fixed Darwin build issues
This commit is contained in:
commit
6e174dbe1f
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, ncurses, openssl, aspell, gnutls
|
||||
, zlib, curl , pkgconfig, libgcrypt
|
||||
, cmake, makeWrapper, libobjc, libiconv
|
||||
, cmake, makeWrapper, libobjc, libresolv, libiconv
|
||||
, asciidoctor # manpages
|
||||
, guileSupport ? true, guile
|
||||
, luaSupport ? true, lua5
|
||||
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||
cmake
|
||||
asciidoctor
|
||||
]
|
||||
++ optionals stdenv.isDarwin [ pync libobjc ]
|
||||
++ optionals stdenv.isDarwin [ pync libobjc libresolv ]
|
||||
++ optional guileSupport guile
|
||||
++ optional luaSupport lua5
|
||||
++ optional perlSupport perl
|
||||
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"
|
||||
# Fix '_res_9_init: undefined symbol' error
|
||||
+ (stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1");
|
||||
+ (stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv");
|
||||
|
||||
postInstall = with stdenv.lib; ''
|
||||
NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages"
|
||||
|
@ -14971,6 +14971,7 @@ in
|
||||
|
||||
weechat = callPackage ../applications/networking/irc/weechat {
|
||||
inherit (darwin) libobjc;
|
||||
inherit (darwin) libresolv;
|
||||
};
|
||||
|
||||
westonLite = callPackage ../applications/window-managers/weston {
|
||||
|
Loading…
Reference in New Issue
Block a user