public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gajim: use libasyncns as resolver

Browse Source
This commit is contained in:
Jörg Thalheim 2017-02-09 14:02:47 +01:00
parent b059f63c6e
commit 8ed1d3f8d8
No known key found for this signature in database
GPG Key ID: CA4106B8D7CC79FA
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/networking/instant-messengers/gajim/default.nix
View File

@ -2,7 +2,7 @@
, ldns, pythonPackages , ldns, pythonPackages
# Test requirements # Test requirements
, xvfb_run, dnsutils , xvfb_run
, enableJingle ? true, farstream ? null, gst_plugins_bad ? null , enableJingle ? true, farstream ? null, gst_plugins_bad ? null
, libnice ? null , libnice ? null
@ -63,9 +63,8 @@ stdenv.mkDerivation rec {
}$GST_PLUGIN_PATH"'" }$GST_PLUGIN_PATH"'"
}' scripts/gajim.in }' scripts/gajim.in
sed -i -e 's/return helpers.is_in_path('"'"'drill.*/return True/' \ # requires network access
src/features_window.py echo "" > test/integration/test_resolver.py
sed -i -e "s|'drill'|'${ldns}/bin/drill'|" src/common/resolver.py
# We want to run tests in installCheckPhase rather than checkPhase to test # We want to run tests in installCheckPhase rather than checkPhase to test
# whether the *installed* version of Gajim works rather than just whether it # whether the *installed* version of Gajim works rather than just whether it
@ -83,19 +82,20 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook pythonPackages.wrapPython intltool pkgconfig autoreconfHook pythonPackages.wrapPython intltool pkgconfig
# Test dependencies # Test dependencies
xvfb_run dnsutils xvfb_run
]; ];
autoreconfPhase = '' autoreconfPhase = ''
sed -e 's/which/type -P/;s,\./configure,:,' autogen.sh | bash sed -e 's/which/type -P/;s,\./configure,:,' autogen.sh | bash
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = with pythonPackages; [
pythonPackages.pygobject2 pythonPackages.pyGtkGlade libasyncns
pythonPackages.pyasn1 pygobject2 pyGtkGlade
pythonPackages.pyxdg pyasn1
pythonPackages.nbxmpp pyxdg
pythonPackages.pyopenssl pythonPackages.dbus-python nbxmpp
pyopenssl dbus-python
] ++ optional enableE2E pythonPackages.pycrypto ] ++ optional enableE2E pythonPackages.pycrypto
++ optional enableRST pythonPackages.docutils ++ optional enableRST pythonPackages.docutils
++ optional enableNotifications pythonPackages.notify ++ optional enableNotifications pythonPackages.notify