diff --git a/overlays/simple.nix b/overlays/simple.nix index 64a20ae..2904283 100644 --- a/overlays/simple.nix +++ b/overlays/simple.nix @@ -66,4 +66,14 @@ final: prev: { # pkgsi686Linux = prev.pkgsi686Linux.extend (pfinal: pprev: { # directx-shader-compiler = pprev.directx-shader-compiler.override {stdenv = pfinal.gcc11Stdenv;}; # }); + + gajim = prev.gajim.overrideAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + # Make the tray icon work + prev.libappindicator-gtk3 + + # Play sounds + prev.gsound + ]; + }); } diff --git a/packages/applications/networking/instant-messengers/gajim/default.nix b/packages/applications/networking/instant-messengers/gajim/default.nix deleted file mode 100644 index 6eef91e..0000000 --- a/packages/applications/networking/instant-messengers/gajim/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib -, python3, nbxmpp -, gettext -, fetchgit -, wrapGAppsHook -, gobject-introspection -, libsoup_3 -, gtksourceview4 -, libappindicator-gtk3 -, farstream -, gst_all_1 -, gsound -}: - -python3.pkgs.buildPythonApplication rec { - pname = "gajim"; - version = "1.7.3"; - format = "pyproject"; - - src = fetchgit { - url = "https://dev.gajim.org/gajim/gajim"; - rev = version; - hash = "sha256-47CzJwmPRl+DggxwI63sp/JJAnEvnNUS1MxFrRIBAw8="; - }; - - nativeBuildInputs = [ - python3.pkgs.setuptools - gettext - wrapGAppsHook - gobject-introspection - ]; - - propagatedBuildInputs = with python3.pkgs; [ - setuptools - pygobject3 - cryptography - css-parser - keyring - nbxmpp - packaging - pillow - precis-i18n - pycairo - gobject-introspection - - # Omemo - python-axolotl - qrcode - - # Additional features - gsound - libappindicator-gtk3 - farstream gst_all_1.gstreamer gst_all_1.gst-libav gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - - # Gtk dependencies - libsoup_3 - gtksourceview4 - ]; - - pythonImportsCheck = [ "gajim" ]; - - meta = with lib; { - description = ""; - homepage = "https://dev.gajim.org/gajim/gajim"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; - }; -} diff --git a/packages/applications/networking/instant-messengers/gajim/nbxmpp.nix b/packages/applications/networking/instant-messengers/gajim/nbxmpp.nix deleted file mode 100644 index ae06164..0000000 --- a/packages/applications/networking/instant-messengers/gajim/nbxmpp.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, buildPythonPackage -, fetchgit -, setuptools -, pygobject3 -, idna -, packaging -, precis-i18n -, gssapi -, pyopenssl -, libsoup_3 -, gobject-introspection -, glib -, glib-networking -}: - -buildPythonPackage rec { - pname = "python-nbxmpp"; - version = "4.2.2"; - format = "pyproject"; - - src = fetchgit { - url = "https://dev.gajim.org/gajim/python-nbxmpp"; - rev = version; - hash = "sha256-ZTX8plcsO4zE7ruLtWIvsagQUvwPHuKdPKRwCrFwvgc="; - }; - - nativeBuildInputs = [ - setuptools - gobject-introspection - ]; - - propagatedBuildInputs = [ - pygobject3 - idna - packaging - precis-i18n - libsoup_3 - glib glib-networking - pyopenssl - gobject-introspection - ]; - - pythonImportsCheck = [ "nbxmpp" ]; - - meta = with lib; { - description = ""; - homepage = "https://dev.gajim.org/gajim/python-nbxmpp"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; - }; -} diff --git a/packages/default.nix b/packages/default.nix index 6461dbb..a5b9740 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -120,9 +120,5 @@ in { #obs-websocket = prev.libsForQt5.callPackage obs/obs-websocket {}; obs-cli = prev.callPackage obs/obs-cli {}; - gajim = prev.callPackage ./applications/networking/instant-messengers/gajim/default.nix { - nbxmpp = prev.python3.pkgs.callPackage ./applications/networking/instant-messengers/gajim/nbxmpp.nix {}; - }; - rgb_keyboard = prev.callPackage ./applications/desktop/rgb_keyboard/default.nix {}; }