Skip to content

filezilla: 3.46.3 -> 3.48.0 #86217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterhoeg merged 2 commits into from
May 2, 2020
Merged

filezilla: 3.46.3 -> 3.48.0 #86217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a2faff
libfilezilla: 0.19.3 -> 0.21.0
peterhoeg Apr 28, 2020
78cc331
filezilla: 3.46.3 -> 3.48.0
peterhoeg Apr 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions pkgs/applications/networking/ftp/filezilla/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
{ stdenv
, fetchurl

, dbus
, gettext
, gnutls
, gtk2
, libfilezilla
, libidn
, nettle
Expand All @@ -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
];

Expand Down
7 changes: 5 additions & 2 deletions pkgs/development/libraries/libfilezilla/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,19 @@

stdenv.mkDerivation rec {
pname = "libfilezilla";
version = "0.19.3";
version = "0.21.0";

src = fetchurl {
url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
sha256 = "0fml6whdbfcwc8nfjhvrnidkscv6q2x988zf3alfjl2mdpw4jgd4";
sha256 = "1wjvxi3spkp58lay590bs5s2i8fn94lqkc7qvq4q7ns4l9k9z3av";
};

nativeBuildInputs = [ pkgconfig ];

buildInputs = [ gettext gnutls nettle ];

enableParallelBuilding = true;

meta = with stdenv.lib; {
homepage = "https://lib.filezilla-project.org/";
description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs";
Expand Down