diff options
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
5 files changed, 60 insertions, 57 deletions
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index a1c81f3f0020..0f9cff4fd8d7 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -17,11 +17,11 @@ with lib; buildPythonApplication rec { name = "gajim-${version}"; majorVersion = "1.0"; - version = "${majorVersion}.2"; + version = "${majorVersion}.3"; src = fetchurl { url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2"; - sha256 = "0wyyy3wrk7ka5xrsbafnajzf7iacg8vg3hi16pl4c5p104hdhjdw"; + sha256 = "0ds4rqwfrpj89a489w6yih8gx5zi7qa4ffgld950fk7s0qxvcfnb"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 707e78459efe..929277996c5e 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -50,13 +50,13 @@ let in stdenv.mkDerivation rec { name = "nheko-${version}"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "mujx"; repo = "nheko"; rev = "v${version}"; - sha256 = "1z9dbvcgwafxr131a8447qkx97x8l93k32xa8xvajgvjlimqphqk"; + sha256 = "0qjia42nam3hj835k2jb5b6j6n56rdkb8rn67yqf45xdz8ypmbmv"; }; # This patch is likely not strictly speaking needed, but will help detect when diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index da862b715147..60c075c2fadb 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,8 +1,10 @@ -{ stdenv, lib, fetchurl, dpkg, gnome3, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, -fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, -libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, -nspr, alsaLib, cups, expat, udev +{ stdenv, lib, fetchurl, dpkg, wrapGAppsHook +, gnome3, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig +, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite +, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib +, cups, expat, udev }: + let rpath = lib.makeLibraryPath [ alsaLib @@ -36,54 +38,56 @@ let xorg.libxcb ]; -in - stdenv.mkDerivation rec { - name = "signal-desktop-${version}"; +in stdenv.mkDerivation rec { + name = "signal-desktop-${version}"; + version = "1.12.0"; - version = "1.12.0"; + src = fetchurl { + url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; + sha256 = "19c9pilx2qkpyqw3p167bfcizrpd4np5jxdcwqmpbcfibmrpmcsk"; + }; - src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "19c9pilx2qkpyqw3p167bfcizrpd4np5jxdcwqmpbcfibmrpmcsk"; - } - else - throw "Signal for Desktop is not currently supported on ${stdenv.system}"; + phases = [ "unpackPhase" "installPhase" ]; - phases = [ "unpackPhase" "installPhase" ]; - nativeBuildInputs = [ dpkg ]; - unpackPhase = "dpkg-deb -x $src ."; - installPhase = '' - mkdir -p $out - cp -R opt $out + nativeBuildInputs = [ dpkg wrapGAppsHook ]; - mv ./usr/share $out/share - mv $out/opt/Signal $out/libexec - rmdir $out/opt + unpackPhase = "dpkg-deb -x $src ."; - chmod -R g-w $out + installPhase = '' + mkdir -p $out + cp -R opt $out - # Patch signal - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop + mv ./usr/share $out/share + mv $out/opt/Signal $out/libexec + rmdir $out/opt - # Symlink to bin - mkdir -p $out/bin - ln -s $out/libexec/signal-desktop $out/bin/signal-desktop + chmod -R g-w $out - # Fix the desktop link - substituteInPlace $out/share/applications/signal-desktop.desktop \ - --replace /opt/Signal/signal-desktop $out/bin/signal-desktop - ''; + # Patch signal + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop + wrapProgram $out/libexec/signal-desktop \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + "''${gappsWrapperArgs[@]}" + + # Symlink to bin + mkdir -p $out/bin + ln -s $out/libexec/signal-desktop $out/bin/signal-desktop - meta = { - description = "Signal Private Messenger for the Desktop."; - homepage = https://signal.org/; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ ixmatus primeos ]; - platforms = [ - "x86_64-linux" - ]; - }; - } + # Fix the desktop link + substituteInPlace $out/share/applications/signal-desktop.desktop \ + --replace /opt/Signal/signal-desktop $out/bin/signal-desktop + ''; + + meta = { + description = "Private, simple, and secure messenger"; + longDescription = '' + Signal Desktop is an Electron application that links with your + "Signal Android" or "Signal iOS" app. + ''; + homepage = https://signal.org/; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ ixmatus primeos ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index e305a4927204..1cf7243476cf 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome3 -, gtk2, libnotify, libpulseaudio, libsecret, libstdcxx5, libv4l, nspr, nss, pango, systemd, xorg }: +, gtk2, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }: let @@ -25,7 +25,7 @@ let gnome3.gconf gdk_pixbuf gtk2 - + gnome3.gnome-keyring @@ -36,7 +36,6 @@ let pango stdenv.cc.cc systemd - libstdcxx5 libv4l xorg.libxkbfile diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 12b6179f8e1a..071f82a8cbec 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.2.17"; - sha256Hash = "1lswjn3rnrbps1pd2xhnhggcn1z0i7y71dpr0v9wb1yc8qhh4pi0"; + version = "1.3.0"; + sha256Hash = "1h5zcvd58bjm02b0rfb7fx1nx1gmzdlk1854lm6kg1hd6mqrrb0i"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "310557"; archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk"; @@ -14,7 +14,7 @@ in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { stable = false; - version = "1.2.24"; - sha256Hash = "0rrji2h2a7fxdl4wmbwj053vwy3hhbaphymjim55klpzj86jycil"; + version = "1.3.4"; + sha256Hash = "17xdzyl7jb5g69a2h6fyk67z7s6h2dqjg8j478px6n0br1n420wk"; }); } |