diff options
| author | Jakob Gillich <jakob@gillich.me> | 2016-01-15 15:15:59 +0100 |
|---|---|---|
| committer | Jakob Gillich <jakob@gillich.me> | 2016-01-16 08:23:59 +0100 |
| commit | 6a24c20744212d6142a1900502ec7a1f8337f087 (patch) | |
| tree | 2dea6228e8dfe85dc86ced85b8ae433288fc2339 | |
| parent | 79cc97c63740c045b9716893a3b5cd7a4fa94c59 (diff) | |
| download | nixlib-6a24c20744212d6142a1900502ec7a1f8337f087.tar nixlib-6a24c20744212d6142a1900502ec7a1f8337f087.tar.gz nixlib-6a24c20744212d6142a1900502ec7a1f8337f087.tar.bz2 nixlib-6a24c20744212d6142a1900502ec7a1f8337f087.tar.lz nixlib-6a24c20744212d6142a1900502ec7a1f8337f087.tar.xz nixlib-6a24c20744212d6142a1900502ec7a1f8337f087.tar.zst nixlib-6a24c20744212d6142a1900502ec7a1f8337f087.zip | |
ricochet: add desktop file, cleanups
closes #11979, #11974
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/ricochet/default.nix | 32 | ||||
| -rw-r--r-- | pkgs/top-level/go-packages.nix | 5 |
2 files changed, 26 insertions, 11 deletions
diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 58f2789679d6..89487e5bf27e 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchurl, pkgconfig -, qtbase, qttools, makeQtWrapper -, qtmultimedia, qtquick1, qtquickcontrols +{ stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip +, qtbase, qttools, makeQtWrapper, qtmultimedia, qtquick1, qtquickcontrols , openssl, protobuf }: @@ -13,11 +12,20 @@ stdenv.mkDerivation rec { sha256 = "0y79igzgl9xn00981zcyxdlks7vnqxhb4rq3x8gwxm0yr98p39ms"; }; - buildInputs = - [ - qtbase qttools qtmultimedia qtquick1 qtquickcontrols - openssl protobuf - ]; + desktopItem = makeDesktopItem { + name = "ricochet"; + exec = "ricochet"; + icon = "ricochet"; + desktopName = "Ricochet"; + genericName = "Ricochet"; + comment = meta.description; + categories = "Office;Email;"; + }; + + buildInputs = [ + qtbase qttools qtmultimedia qtquick1 qtquickcontrols + openssl protobuf + ]; nativeBuildInputs = [ pkgconfig makeQtWrapper ]; @@ -33,12 +41,18 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp ricochet $out/bin wrapQtProgram $out/bin/ricochet + + mkdir -p $out/share/applications + cp $desktopItem/share/applications"/"* $out/share/applications + + mkdir -p $out/share/pixmaps + cp icons/ricochet.png $out/share/pixmaps/ricochet.png ''; meta = with stdenv.lib; { description = "Anonymous peer-to-peer instant messaging"; homepage = "https://ricochet.im"; license = licenses.bsd3; - maintainers = [ maintainers.codsl ]; + maintainers = [ maintainers.codsl maintainers.jgillich ]; }; } diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index a2d112b922cc..f363dea9db47 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -3362,10 +3362,11 @@ let }; xmpp-client = buildFromGitHub { - rev = "dc9d6be127f7c044ca0d56e5681c717a440ac177"; + rev = "525bd26cf5f56ec5aee99464714fd1d019c119ff"; + date = "2016-01-10"; owner = "agl"; repo = "xmpp-client"; - sha256 = "1zxh88mfzvq7fzf0536qy8kpcl82nw4jwrvyb9z6lhwk05gmi3vi"; + sha256 = "0a1r08zs723ikcskmn6ylkdi3frcd0i0lkx30i9q39ilf734v253"; disabled = isGo14; buildInputs = [ crypto net ]; |