diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 20:53:27 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 20:53:27 +0200 |
commit | 14aa936ec52cc01c0b67470bf83b7b0b9aad6aef (patch) | |
tree | b8b511e368df0c9583d41b9347673b3164a797dd /pkgs/applications/networking/instant-messengers | |
parent | 6cb6ea1fed65bef4f2e9f02241a3e828c57fe57d (diff) | |
parent | 4ff7702082bad838e70140091afe7e77a9f00eca (diff) | |
download | nixlib-14aa936ec52cc01c0b67470bf83b7b0b9aad6aef.tar nixlib-14aa936ec52cc01c0b67470bf83b7b0b9aad6aef.tar.gz nixlib-14aa936ec52cc01c0b67470bf83b7b0b9aad6aef.tar.bz2 nixlib-14aa936ec52cc01c0b67470bf83b7b0b9aad6aef.tar.lz nixlib-14aa936ec52cc01c0b67470bf83b7b0b9aad6aef.tar.xz nixlib-14aa936ec52cc01c0b67470bf83b7b0b9aad6aef.tar.zst nixlib-14aa936ec52cc01c0b67470bf83b7b0b9aad6aef.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
5 files changed, 79 insertions, 14 deletions
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 00e94234405c..516abb4c9c00 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -55,11 +55,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.15.4"; + version = "1.15.5"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "02k64hnfzq8d5g805n4bjm2x8xazskp8fwbmcbl2s2rshdwil1jz"; + sha256 = "1a63kyxbhdaz6izprg8wryvscmvfjii50xi1v5pxlf74x2pkxs8k"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix new file mode 100644 index 000000000000..ce73acf8d596 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook +, xorg, gtk2, gtk3 , gnome2, gnome3, nss, alsaLib, udev, libnotify, xdg_utils }: + +with stdenv.lib; + +let + bits = "x86_64"; + + version = "3.14.10"; + + desktopItem = makeDesktopItem rec { + name = "Wavebox"; + exec = name; + icon = "wavebox"; + desktopName = name; + genericName = name; + categories = "Network;"; + }; + + tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz"; + +in stdenv.mkDerivation rec { + name = "wavebox-${version}"; + src = fetchurl { + url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}"; + sha256 = "06ce349f561c6122b2d326e9a1363fb358e263c81a7d1d08723ec567235bbd74"; + }; + + # don't remove runtime deps + dontPatchELF = true; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + + buildInputs = with xorg; [ + libXScrnSaver libXtst + ] ++ [ + gtk3 nss gtk2 alsaLib gnome2.GConf + ]; + + runtimeDependencies = [ udev.lib libnotify ]; + + installPhase = '' + mkdir -p $out/bin $out/opt/wavebox + cp -r * $out/opt/wavebox + + # provide desktop item and icon + mkdir -p $out/share/applications $out/share/pixmaps + ln -s ${desktopItem}/share/applications/* $out/share/applications + ln -s $out/opt/wavebox/Wavebox-linux-x64/wavebox_icon.png $out/share/pixmaps/wavebox.png + ''; + + postFixup = '' + paxmark m $out/opt/wavebox/Wavebox + makeWrapper $out/opt/wavebox/Wavebox $out/bin/wavebox \ + --prefix PATH : ${xdg_utils}/bin + ''; + + meta = with stdenv.lib; { + description = "Wavebox messaging application"; + homepage = https://wavebox.io; + license = licenses.mpl20; + maintainers = with maintainers; [ rawkode ]; + platforms = ["x86_64-linux"]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix b/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix index 8c7e80b3ff8d..4b92d1212c55 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix +++ b/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xmpppy }: +{ stdenv, fetchFromGitHub, xmpppy, pydns, substituteAll, buildEnv }: stdenv.mkDerivation { name = "weechat-jabber-2017-08-30"; @@ -15,15 +15,14 @@ stdenv.mkDerivation { cp jabber.py $out/share/jabber.py ''; - buildInputs = [ xmpppy ]; - - postPatch = '' - substituteInPlace jabber.py \ - --replace "__NIX_OUTPUT__" "${xmpppy}/lib/python2.7/site-packages" - ''; - patches = [ - ./libpath.patch + (substituteAll { + src = ./libpath.patch; + env = "${buildEnv { + name = "weechat-xmpp-env"; + paths = [ pydns xmpppy ]; + }}/lib/python2.7/site-packages"; + }) ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch b/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch index d3faab33a8e5..372c83944a27 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch +++ b/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch @@ -8,7 +8,7 @@ index 27006a3..e53c2c0 100644 +import sys + -+sys.path.append('__NIX_OUTPUT__') ++sys.path.append('@env@') + + import_ok = True diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 72812563b099..afc6f03edb4a 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -13,11 +13,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "2.2.128200.0702"; + version = "2.3.128305.0716"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0n9kyj94bj35gbpwiz4kq7hc8pwfqwnfqf003g4c8gx5pda3g56w"; + sha256 = "1jpw5sclr5bhif559hmnyiggjh6gkm1smiw34y3ad4k8xhag9dkh"; }; }; |