diff options
author | gnidorah <gnidorah@users.noreply.github.com> | 2019-01-12 01:17:46 +0300 |
---|---|---|
committer | gnidorah <gnidorah@users.noreply.github.com> | 2019-01-12 08:56:24 +0300 |
commit | e107569b6f299f1ee5795c5a311051f83acb6e7a (patch) | |
tree | 20b679e7dc454df4f7ed2d5c105d6c7501d22c12 /pkgs/applications/networking/instant-messengers/franz | |
parent | 7ef94bee72f19f4eec17d0dd35df89d66b047042 (diff) |
franz: 4.0.4 -> 5.0.0-beta.19
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/franz')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/franz/default.nix | 48 |
1 files changed, 16 insertions, 32 deletions
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 4b8670f23d43..d33761ba772e 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -1,60 +1,44 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook -, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk2 +{ stdenv, fetchurl, makeWrapper, autoPatchelfHook, dpkg +, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk3 , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let - bits = if stdenv.hostPlatform.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;"; - }; + version = "5.0.0-beta.19"; in stdenv.mkDerivation rec { name = "franz-${version}"; src = fetchurl { - url = "https://github.com/meetfranz/franz-app/releases/download/${version}/Franz-linux-${bits}-${version}.tgz"; - sha256 = if bits == "x64" then - "0ssym0jfrig474g6j67g1jfybjkxnyhbqqjvrs8z6ihwlyd3rrk5" else - "16l9jma2hiwzl9l41yhrwribcgmxca271rq0cfbbm9701mmmciyy"; + url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; + sha256 = "1b9b8y19iqx8bnax7hbh9rkjfxk8a9gqb1akrcxwwfi46l816gyy"; }; # don't remove runtime deps dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper dpkg ]; buildInputs = (with xorg; [ libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libXrender libX11 libXtst libXScrnSaver ]) ++ [ - gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + gtk3 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc ]; runtimeDependencies = [ udev.lib libnotify ]; - unpackPhase = '' - tar xzf $src - ''; + unpackPhase = "dpkg-deb -x $src ."; installPhase = '' - mkdir -p $out/bin $out/opt/franz - cp -r * $out/opt/franz - ln -s $out/opt/franz/Franz $out/bin + mkdir -p $out/bin + cp -r opt $out + ln -s $out/opt/Franz/franz $out/bin # 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/franz/resources/app.asar.unpacked/assets/franz.png $out/share/pixmaps + cp -r usr/share $out + substituteInPlace $out/share/applications/franz.desktop \ + --replace Exec=\"/opt/Franz/franz\" Exec=franz ''; postFixup = '' - wrapProgram $out/opt/franz/Franz --prefix PATH : ${xdg_utils}/bin + wrapProgram $out/opt/Franz/franz --prefix PATH : ${xdg_utils}/bin ''; meta = with stdenv.lib; { @@ -62,7 +46,7 @@ in stdenv.mkDerivation rec { homepage = https://meetfranz.com; license = licenses.free; maintainers = [ maintainers.gnidorah ]; - platforms = ["i686-linux" "x86_64-linux"]; + platforms = ["x86_64-linux"]; hydraPlatforms = []; }; } |