diff options
| author | Peter Hoeg <peter@hoeg.com> | 2020-04-28 22:46:36 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2020-05-01 16:38:21 +0800 |
| commit | 78cc33197ccb2df2652964599ba818cc592d64da (patch) | |
| tree | 18eb9ffd94d9e2d9bf0874da3edefd464f728902 /pkgs/applications/networking/ftp | |
| parent | 0a2faff305291bde4661741b0ad69983fa9078e1 (diff) | |
filezilla: 3.46.3 -> 3.48.0
Diffstat (limited to 'pkgs/applications/networking/ftp')
| -rw-r--r-- | pkgs/applications/networking/ftp/filezilla/default.nix | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 8bb38230d5c1..780385b28f31 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,10 +1,8 @@ { stdenv , fetchurl - , dbus , gettext , gnutls -, gtk2 , libfilezilla , libidn , nettle @@ -16,33 +14,46 @@ , 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 { pname = "filezilla"; - version = "3.46.3"; + version = "3.48.0"; src = fetchurl { 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 = [ "--disable-manualupdatecheck" "--disable-autoupdatecheck" ]; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus gettext gnutls - gtk2 libfilezilla libidn nettle pugixml sqlite tinyxml - wxGTK30 + wxgtk' + wxgtk'.gtk xdg_utils ]; |