public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

filezilla: use wxGTK30-gtk3 instead of local override

Browse Source
This commit is contained in:
Peter Hoeg 2020-06-15 11:01:53 +08:00
parent 7439aad737
commit a84278aee5
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/ftp/filezilla/default.nix
View File

@ -10,16 +10,10 @@
, pugixml , pugixml
, sqlite , sqlite
, tinyxml , tinyxml
, wxGTK30 , wxGTK30-gtk3
, 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.48.1"; version = "3.48.1";
@ -52,8 +46,8 @@ stdenv.mkDerivation rec {
pugixml pugixml
sqlite sqlite
tinyxml tinyxml
wxgtk' wxGTK30-gtk3
wxgtk'.gtk wxGTK30-gtk3.gtk
xdg_utils xdg_utils
]; ];