diff options
| author | gnidorah <gnidorah@users.noreply.github.com> | 2017-11-01 16:17:44 +0300 |
|---|---|---|
| committer | gnidorah <gnidorah@users.noreply.github.com> | 2017-11-02 07:39:03 +0300 |
| commit | caa8284e096bcda78f64c230df6b8f6c05990935 (patch) | |
| tree | 720a7b42976a42557d705748eabbe5cc2acc0fd8 /pkgs/applications/networking | |
| parent | 33cdc2b4839aecb39c807122512e716275a15737 (diff) | |
rambox, franz: install xdg_utils for url opening
xorg installs this, but wayland doesn't
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/franz/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/rambox/default.nix | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index a238009cd11b6..c2e6528e637ee 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 38d489de02af3..55e78c0ec63bc 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,6 +1,6 @@ -{ 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" @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { # 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; { |