b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #19447 from gnidorah/master2

Browse source 
rambox, franz: make menu item
This commit is contained in:
Jörg Thalheim 2016-10-12 10:42:39 +02:00 committed by GitHub
parent f3c6236eb4 053214c6d2
commit fe11f628ca
2 changed files with 39 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/applications/networking/instant-messengers/franz/default.nix
View file

@ -1,14 +1,25 @@
{ stdenv, fetchurl
{ stdenv, fetchurl, makeDesktopItem
, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }:
stdenv.mkDerivation rec {
let
bits = if stdenv.system == "x86_64-linux" then "x64"
else "ia32";
version = "4.0.4";
desktopItem = makeDesktopItem rec {
name = "Franz";
exec = name;
icon = "franz";
desktopName = name;
genericName = "Franz messenger";
categories = "Network;";
};
in stdenv.mkDerivation rec {
name = "franz-${version}";
src = fetchurl {
url = "https://github.com/meetfranz/franz-app/releases/download/4.0.4/Franz-linux-${bits}-${version}.tgz";
url = "https://github.com/meetfranz/franz-app/releases/download/${version}/Franz-linux-${bits}-${version}.tgz";
sha256 = if bits == "x64" then
"0ssym0jfrig474g6j67g1jfybjkxnyhbqqjvrs8z6ihwlyd3rrk5" else
"16l9jma2hiwzl9l41yhrwribcgmxca271rq0cfbbm9701mmmciyy";
@ -36,6 +47,10 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin $out/share/franz
cp -r * $out/share/franz
ln -s $out/share/franz/Franz $out/bin
mkdir -p $out/share/applications $out/share/pixmaps
ln -s ${desktopItem}/share/applications/* $out/share/applications
ln -s $out/share/franz/resources/app.asar.unpacked/assets/franz.png $out/share/pixmaps
'';
meta = with stdenv.lib; {

23
pkgs/applications/networking/instant-messengers/rambox/default.nix
View file

@ -1,11 +1,27 @@
{ stdenv, fetchurl
{ stdenv, fetchurl, makeDesktopItem
, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }:
stdenv.mkDerivation rec {
let
bits = if stdenv.system == "x86_64-linux" then "x64"
else "ia32";
version = "0.4.4";
myIcon = fetchurl {
url = "https://raw.githubusercontent.com/saenzramiro/rambox/9e4444e6297dd35743b79fe23f8d451a104028d5/resources/Icon.png";
sha256 = "0r00l4r5mlbgn689i3rp6ks11fgs4h2flvrlggvm2qdd974d1x0b";
};
desktopItem = makeDesktopItem rec {
name = "Rambox";
exec = name;
icon = myIcon;
desktopName = name;
genericName = "Rambox messenger";
categories = "Network;";
};
in stdenv.mkDerivation rec {
name = "rambox-${version}";
src = fetchurl {
url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-${bits}.tar.gz";
@ -32,6 +48,9 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin $out/share/rambox
cp -r * $out/share/rambox
ln -s $out/share/rambox/Rambox $out/bin
mkdir -p $out/share/applications
ln -s ${desktopItem}/share/applications/* $out/share/applications
'';
meta = with stdenv.lib; {