From c780d1a157ac885d07d1cc27c3de69a051328630 Mon Sep 17 00:00:00 2001 From: Volth Date: Thu, 4 May 2017 22:34:11 +0000 Subject: [PATCH] far2l: no need to fix xterm's path, it is used only when xterm is on $PATH --- pkgs/applications/misc/far2l/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 0e6d6f49b95..105f3448600 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, - xdg_utils, xterm, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }: + xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }: stdenv.mkDerivation rec { rev = "94b09a84db803a2e7071094e7fa776948c6a64f2"; @@ -23,8 +23,7 @@ stdenv.mkDerivation rec { substituteInPlace far2l/bootstrap/open.sh \ --replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash' substituteInPlace far2l/bootstrap/open.sh \ - --replace 'xdg-open' '${xdg_utils}/bin/xdg-open' \ - --replace 'xterm' '${xterm}/bin/xterm' + --replace 'xdg-open' '${xdg_utils}/bin/xdg-open' substituteInPlace far2l/vtcompletor.cpp \ --replace '"/bin/bash"' '"${bash}/bin/bash"' substituteInPlace multiarc/src/formats/zip/zip.cpp \