MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #19767 from ajevans85/bug/19684_weechat_osx_res_9_init_build_failure

Browse source 
weechat: Fixed Darwin build issues
This commit is contained in:
Jörg Thalheim 2016-10-22 17:04:19 +02:00 committed by GitHub
commit 6e174dbe1f
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 {