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

rambox, franz: install xdg_utils for url opening

Browse Source 
xorg installs this, but wayland doesn't
This commit is contained in:
gnidorah 2017-11-01 16:17:44 +03:00
parent 33cdc2b483
commit caa8284e09
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/instant-messengers/franz/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeDesktopItem { stdenv, fetchurl, makeDesktopItem, makeWrapper
, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig , 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 let
bits = if stdenv.system == "x86_64-linux" then "x64" bits = if stdenv.system == "x86_64-linux" then "x64"
@ -39,6 +39,8 @@ in stdenv.mkDerivation rec {
# don't remove runtime deps # don't remove runtime deps
dontPatchELF = true; dontPatchELF = true;
buildInputs = [ makeWrapper ];
unpackPhase = '' unpackPhase = ''
tar xzf $src tar xzf $src
''; '';
@ -59,6 +61,7 @@ in stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
paxmark m $out/opt/franz/Franz paxmark m $out/opt/franz/Franz
wrapProgram $out/opt/franz/Franz --prefix PATH : ${xdg_utils}/bin
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

7
pkgs/applications/networking/instant-messengers/rambox/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, dpkg { stdenv, fetchurl, dpkg, makeWrapper
, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig , 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 let
bits = if stdenv.system == "x86_64-linux" then "x64" bits = if stdenv.system == "x86_64-linux" then "x64"
@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
# don't remove runtime deps # don't remove runtime deps
dontPatchELF = true; dontPatchELF = true;
buildInputs = [ dpkg ]; buildInputs = [ dpkg makeWrapper ];
unpackPhase = "dpkg-deb -x $src ."; unpackPhase = "dpkg-deb -x $src .";
@ -50,6 +50,7 @@ in stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
paxmark m $out/opt/Rambox/rambox paxmark m $out/opt/Rambox/rambox
wrapProgram $out/opt/Rambox/rambox --prefix PATH : ${xdg_utils}/bin
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {