mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 15:11:25 +00:00
gajim: use libasyncns as resolver
This commit is contained in:
parent
b059f63c6e
commit
8ed1d3f8d8
@ -2,7 +2,7 @@
|
||||
, ldns, pythonPackages
|
||||
|
||||
# Test requirements
|
||||
, xvfb_run, dnsutils
|
||||
, xvfb_run
|
||||
|
||||
, enableJingle ? true, farstream ? null, gst_plugins_bad ? null
|
||||
, libnice ? null
|
||||
@ -63,9 +63,8 @@ stdenv.mkDerivation rec {
|
||||
}$GST_PLUGIN_PATH"'"
|
||||
}' scripts/gajim.in
|
||||
|
||||
sed -i -e 's/return helpers.is_in_path('"'"'drill.*/return True/' \
|
||||
src/features_window.py
|
||||
sed -i -e "s|'drill'|'${ldns}/bin/drill'|" src/common/resolver.py
|
||||
# requires network access
|
||||
echo "" > test/integration/test_resolver.py
|
||||
|
||||
# We want to run tests in installCheckPhase rather than checkPhase to test
|
||||
# whether the *installed* version of Gajim works rather than just whether it
|
||||
@ -83,19 +82,20 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook pythonPackages.wrapPython intltool pkgconfig
|
||||
# Test dependencies
|
||||
xvfb_run dnsutils
|
||||
xvfb_run
|
||||
];
|
||||
|
||||
autoreconfPhase = ''
|
||||
sed -e 's/which/type -P/;s,\./configure,:,' autogen.sh | bash
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pythonPackages.pygobject2 pythonPackages.pyGtkGlade
|
||||
pythonPackages.pyasn1
|
||||
pythonPackages.pyxdg
|
||||
pythonPackages.nbxmpp
|
||||
pythonPackages.pyopenssl pythonPackages.dbus-python
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
libasyncns
|
||||
pygobject2 pyGtkGlade
|
||||
pyasn1
|
||||
pyxdg
|
||||
nbxmpp
|
||||
pyopenssl dbus-python
|
||||
] ++ optional enableE2E pythonPackages.pycrypto
|
||||
++ optional enableRST pythonPackages.docutils
|
||||
++ optional enableNotifications pythonPackages.notify
|
||||
|
Loading…
Reference in New Issue
Block a user