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

Merge pull request #153518 from abbradar/gajim-fixes

Browse Source 
Gajim fixes
This commit is contained in:
7c6f434c 2022-01-05 06:11:22 +00:00 committed by GitHub
commit fc06653254
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ lib, fetchurl, gettext, wrapGAppsHook
{ lib, fetchurl, fetchFromGitLab, gettext, wrapGAppsHook
# Native dependencies
, python3, gtk3, gobject-introspection, gnome
@ -41,6 +41,21 @@ python3.pkgs.buildPythonApplication rec {
gettext wrapGAppsHook
];
# Workaround for https://dev.gajim.org/gajim/gajim/-/issues/10719.
# We don't use plugin release URL because it's updated in place.
plugins = fetchFromGitLab {
domain = "dev.gajim.org";
owner = "gajim";
repo = "gajim-plugins";
rev = "fea522e4360cec6ceacbf1df92644ab3343d4b99";
sha256 = "sha256-CmwEiLsdldoOfgHfWL/5hf/dp0HEDNAIlc5N0Np20KE=";
};
postPatch = ''
mkdir -p gajim/data/plugins
cp -r $plugins/plugin_installer gajim/data/plugins
'';
dontWrapGApps = true;
preFixup = ''
@ -59,7 +74,8 @@ python3.pkgs.buildPythonApplication rec {
checkPhase = ''
xvfb-run dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
${python3.interpreter} setup.py test
${python3.interpreter} -m unittest discover -s test/unit -v
${python3.interpreter} -m unittest discover -s test/no_gui -v
'';
# necessary for wrapGAppsHook