Merge pull request #70502 from jluttine/fix-surf-path

surf: add run-time dependencies to PATH
This commit is contained in:
worldofpeace 2019-10-13 19:23:26 +00:00 committed by GitHub
commit 2f87a2fa8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl { lib, stdenv, fetchurl
, pkgconfig, wrapGAppsHook , pkgconfig, wrapGAppsHook
, glib, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk , glib, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk
, xorg, dmenu, findutils, gnused, coreutils
, patches ? null , patches ? null
}: }:
@ -20,6 +21,16 @@ stdenv.mkDerivation rec {
installFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];
# Add run-time dependencies to PATH. Append them to PATH so the user can
# override the dependencies with their own PATH.
preFixup = let
depsPath = lib.makeBinPath [ xorg.xprop dmenu findutils gnused coreutils ];
in ''
gappsWrapperArgs+=(
--suffix PATH : ${depsPath}
)
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A simple web browser based on WebKit/GTK"; description = "A simple web browser based on WebKit/GTK";
longDescription = '' longDescription = ''