diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-05-07 19:54:21 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-05-07 19:56:25 +0200 |
commit | fcc68a43aab781f05c8fb8cbe06102ce5fd2b473 (patch) | |
tree | 7f6cd4727f35ef12893a9b1429b8c560ab874148 /pkgs/applications | |
parent | 05a7b69509f78b4ae9d04fcdf8f57ceb435572fc (diff) | |
parent | 2ba59c0f8eed5fa23f5582ab50436aa8946c3bde (diff) | |
download | nixlib-fcc68a43aab781f05c8fb8cbe06102ce5fd2b473.tar nixlib-fcc68a43aab781f05c8fb8cbe06102ce5fd2b473.tar.gz nixlib-fcc68a43aab781f05c8fb8cbe06102ce5fd2b473.tar.bz2 nixlib-fcc68a43aab781f05c8fb8cbe06102ce5fd2b473.tar.lz nixlib-fcc68a43aab781f05c8fb8cbe06102ce5fd2b473.tar.xz nixlib-fcc68a43aab781f05c8fb8cbe06102ce5fd2b473.tar.zst nixlib-fcc68a43aab781f05c8fb8cbe06102ce5fd2b473.zip |
Merge branch 'staging-next'
The nss update is needed for security update of firefox. For linux platforms only about 1k aarch64 rebuilds are missing; the diff on Hydra looks OK. Darwin needs 20k more rebuilds, but I don't think we want to wait for that.
Diffstat (limited to 'pkgs/applications')
-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 ]; |