filezilla: 3.46.3 -> 3.48.0

This commit is contained in:
Peter Hoeg 2020-04-28 22:46:36 +08:00
parent 0a2faff305
commit 78cc33197c

View File

@ -1,10 +1,8 @@
{ stdenv { stdenv
, fetchurl , fetchurl
, dbus , dbus
, gettext , gettext
, gnutls , gnutls
, gtk2
, libfilezilla , libfilezilla
, libidn , libidn
, nettle , nettle
@ -16,33 +14,46 @@
, xdg_utils , xdg_utils
}: }:
let
# we can drop this when wxgtk is built with gtk3 by default
# see: https://github.com/NixOS/nixpkgs/pull/73145
wxgtk' = wxGTK30.override { compat26 = false; withGtk2 = false; };
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "filezilla"; pname = "filezilla";
version = "3.46.3"; version = "3.48.0";
src = fetchurl { src = fetchurl {
url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
sha256 = "15bkg9qs07h4pzkxba1gymp8f264dk0zrzd9brx48fcwm7qbzigi"; sha256 = "0msxl8ihbycd56hmn1q8sl1gzmsxc7j8ar9k4zsryd0ayyz7wv05";
}; };
# https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769
postPatch = ''
sed -i src/interface/Mainfrm.h \
-e '/^#define/a #include <list>'
'';
configureFlags = [ configureFlags = [
"--disable-manualupdatecheck" "--disable-manualupdatecheck"
"--disable-autoupdatecheck" "--disable-autoupdatecheck"
]; ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
dbus dbus
gettext gettext
gnutls gnutls
gtk2
libfilezilla libfilezilla
libidn libidn
nettle nettle
pugixml pugixml
sqlite sqlite
tinyxml tinyxml
wxGTK30 wxgtk'
wxgtk'.gtk
xdg_utils xdg_utils
]; ];