From 8a0c8b30857267df9c7e83323d3ba46186d939b2 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 6 Oct 2019 08:58:48 +0300 Subject: [PATCH] surf: add run-time dependencies to PATH Fix #70410 --- .../networking/browsers/surf/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index d9d4fda1aedd..0437ab933bd7 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , pkgconfig, wrapGAppsHook , glib, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk +, xorg, dmenu, findutils, gnused, coreutils , patches ? null }: @@ -20,6 +21,16 @@ stdenv.mkDerivation rec { 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; { description = "A simple web browser based on WebKit/GTK"; longDescription = ''