From c5194a2c550194f63b8dab63b66cef1e865d270e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 9 Jun 2019 13:13:11 +0200 Subject: [PATCH] Revert "filezilla: add wrapper to set necessary FZ_DATADIR" This reverts commit 61940b89a5646987e8b7a8fe7277ec7534c957b1 #62340. Apparently it's not needed anymore after the update, so let me clean up. --- pkgs/applications/networking/ftp/filezilla/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index bc0d943e22bc..6bac5bd58362 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext -, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle -, makeWrapper -}: +, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: let version = "3.42.1"; in stdenv.mkDerivation { @@ -20,14 +18,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus gnutls wxGTK30 libidn tinyxml gettext xdg_utils gtk2 sqlite - pugixml libfilezilla nettle makeWrapper ]; + pugixml libfilezilla nettle ]; enableParallelBuilding = true; - postInstall = '' - wrapProgram $out/bin/filezilla --set FZ_DATADIR $out - ''; - meta = with stdenv.lib; { homepage = https://filezilla-project.org/; description = "Graphical FTP, FTPS and SFTP client";