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

ricochet: add desktop file, cleanups

Browse Source 
closes #11979, #11974
This commit is contained in:
Jakob Gillich 2016-01-15 15:15:59 +01:00
parent 79cc97c637
commit 6a24c20744
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/applications/networking/instant-messengers/ricochet/default.nix
View File

@ -1,6 +1,5 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip
, qtbase, qttools, makeQtWrapper , qtbase, qttools, makeQtWrapper, qtmultimedia, qtquick1, qtquickcontrols
, qtmultimedia, qtquick1, qtquickcontrols
, openssl, protobuf , openssl, protobuf
}: }:
@ -13,11 +12,20 @@ stdenv.mkDerivation rec {
sha256 = "0y79igzgl9xn00981zcyxdlks7vnqxhb4rq3x8gwxm0yr98p39ms"; sha256 = "0y79igzgl9xn00981zcyxdlks7vnqxhb4rq3x8gwxm0yr98p39ms";
}; };
buildInputs = desktopItem = makeDesktopItem {
[ name = "ricochet";
qtbase qttools qtmultimedia qtquick1 qtquickcontrols exec = "ricochet";
openssl protobuf icon = "ricochet";
]; desktopName = "Ricochet";
genericName = "Ricochet";
comment = meta.description;
categories = "Office;Email;";
};
buildInputs = [
qtbase qttools qtmultimedia qtquick1 qtquickcontrols
openssl protobuf
];
nativeBuildInputs = [ pkgconfig makeQtWrapper ]; nativeBuildInputs = [ pkgconfig makeQtWrapper ];
@ -33,12 +41,18 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin mkdir -p $out/bin
cp ricochet $out/bin cp ricochet $out/bin
wrapQtProgram $out/bin/ricochet 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; { meta = with stdenv.lib; {
description = "Anonymous peer-to-peer instant messaging"; description = "Anonymous peer-to-peer instant messaging";
homepage = "https://ricochet.im"; homepage = "https://ricochet.im";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = [ maintainers.codsl ]; maintainers = [ maintainers.codsl maintainers.jgillich ];
}; };
} }

5
pkgs/top-level/go-packages.nix
View File

@ -3362,10 +3362,11 @@ let
}; };
xmpp-client = buildFromGitHub { xmpp-client = buildFromGitHub {
rev = "dc9d6be127f7c044ca0d56e5681c717a440ac177"; rev = "525bd26cf5f56ec5aee99464714fd1d019c119ff";
date = "2016-01-10";
owner = "agl"; owner = "agl";
repo = "xmpp-client"; repo = "xmpp-client";
sha256 = "1zxh88mfzvq7fzf0536qy8kpcl82nw4jwrvyb9z6lhwk05gmi3vi"; sha256 = "0a1r08zs723ikcskmn6ylkdi3frcd0i0lkx30i9q39ilf734v253";
disabled = isGo14; disabled = isGo14;
buildInputs = [ crypto net ]; buildInputs = [ crypto net ];