ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-14 15:36:47 +03:00
Code Issues Projects Releases Wiki Activity

weechat: Fixed Darwin build issues

Browse Source 
Build was failing with res_9_init missing on OS X. Resolved with a little help from
https://github.com/Homebrew/homebrew-core/pull/4427.
This commit is contained in:
Adam Evans 2016-10-20 23:28:27 +11:00
parent 35bcfdbbfb
commit 5da42092fa
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/irc/weechat/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, ncurses, openssl, aspell, gnutls { stdenv, fetchurl, ncurses, openssl, aspell, gnutls
, zlib, curl , pkgconfig, libgcrypt , zlib, curl , pkgconfig, libgcrypt
, cmake, makeWrapper, libobjc, libiconv , cmake, makeWrapper, libobjc, libresolv, libiconv
, asciidoctor # manpages , asciidoctor # manpages
, guileSupport ? true, guile , guileSupport ? true, guile
, luaSupport ? true, lua5 , luaSupport ? true, lua5
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
cmake cmake
asciidoctor asciidoctor
] ]
++ optionals stdenv.isDarwin [ pync libobjc ] ++ optionals stdenv.isDarwin [ pync libobjc libresolv ]
++ optional guileSupport guile ++ optional guileSupport guile
++ optional luaSupport lua5 ++ optional luaSupport lua5
++ optional perlSupport perl ++ optional perlSupport perl
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"
# Fix '_res_9_init: undefined symbol' error # 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; '' postInstall = with stdenv.lib; ''
NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages" NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages"

1
pkgs/top-level/all-packages.nix
View File

@ -14971,6 +14971,7 @@ in
weechat = callPackage ../applications/networking/irc/weechat { weechat = callPackage ../applications/networking/irc/weechat {
inherit (darwin) libobjc; inherit (darwin) libobjc;
inherit (darwin) libresolv;
}; };
westonLite = callPackage ../applications/window-managers/weston { westonLite = callPackage ../applications/window-managers/weston {