diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-11-02 08:30:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-02 08:30:32 +0000 |
| commit | 6e90af6897332b92472fb28b4631a8b35e0f066d (patch) | |
| tree | d97f09754be18384f4e6065e60d4f28a65d00b3b /pkgs/applications/networking/instant-messengers | |
| parent | 7daa03590d0119c37a9ad25174ee6a40bdac670a (diff) | |
| parent | 85f5d5ce16f81635e05869eda702a9333a96f9fd (diff) | |
| download | nixlib-6e90af6897332b92472fb28b4631a8b35e0f066d.tar nixlib-6e90af6897332b92472fb28b4631a8b35e0f066d.tar.gz nixlib-6e90af6897332b92472fb28b4631a8b35e0f066d.tar.bz2 nixlib-6e90af6897332b92472fb28b4631a8b35e0f066d.tar.lz nixlib-6e90af6897332b92472fb28b4631a8b35e0f066d.tar.xz nixlib-6e90af6897332b92472fb28b4631a8b35e0f066d.tar.zst nixlib-6e90af6897332b92472fb28b4631a8b35e0f066d.zip | |
Merge pull request #31095 from gnidorah/rambox
rambox: 0.5.12 -> 0.5.13
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/franz/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/rambox/default.nix | 13 |
2 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index a238009cd11b..c2e6528e637e 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, makeDesktopItem +{ stdenv, fetchurl, makeDesktopItem, makeWrapper , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig -, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: +, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let bits = if stdenv.system == "x86_64-linux" then "x64" @@ -39,6 +39,8 @@ in stdenv.mkDerivation rec { # don't remove runtime deps dontPatchELF = true; + buildInputs = [ makeWrapper ]; + unpackPhase = '' tar xzf $src ''; @@ -59,6 +61,7 @@ in stdenv.mkDerivation rec { postFixup = '' paxmark m $out/opt/franz/Franz + wrapProgram $out/opt/franz/Franz --prefix PATH : ${xdg_utils}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 38d489de02af..7c8367d7f7fb 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, dpkg +{ stdenv, fetchurl, dpkg, makeWrapper , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig -, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: +, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let bits = if stdenv.system == "x86_64-linux" then "x64" else "ia32"; - version = "0.5.12"; + version = "0.5.13"; runtimeDeps = [ udev libnotify @@ -23,14 +23,14 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox_${version}-${bits}.deb"; sha256 = if bits == "x64" then - "1jlvpq7wryz4vf6xlsb9c38jrhjiv18rdf2ndlv76png60wl8418" else - "063j3gcpp18wdvspy7d43cgv7i5v8c42hn2zpp083jixw9ddsqwa"; + "0bn562fr1wsnn3xsd4q2rrxi6c56vckrkfmjl2dqb30hpmj2vn0d" else + "180ndvkil5mk5idwnn7spfygnhhll6pjc342pfzgmzk46a723qs4"; }; # don't remove runtime deps dontPatchELF = true; - buildInputs = [ dpkg ]; + buildInputs = [ dpkg makeWrapper ]; unpackPhase = "dpkg-deb -x $src ."; @@ -50,6 +50,7 @@ in stdenv.mkDerivation rec { postFixup = '' paxmark m $out/opt/Rambox/rambox + wrapProgram $out/opt/Rambox/rambox --prefix PATH : ${xdg_utils}/bin ''; meta = with stdenv.lib; { |