diff options
| author | Peter Hoeg <peter@hoeg.com> | 2020-06-15 11:01:53 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2020-06-15 11:01:53 +0800 |
| commit | a84278aee5fa0cfb0da6707628539f9b1256f6c3 (patch) | |
| tree | bcd2cf59b673ab28ace6d8a9c55de84120381ff4 | |
| parent | 7439aad737c00915ecc09703ba65721d0513f563 (diff) | |
| download | nixpkgs-a84278aee5fa0cfb0da6707628539f9b1256f6c3.tar nixpkgs-a84278aee5fa0cfb0da6707628539f9b1256f6c3.tar.gz nixpkgs-a84278aee5fa0cfb0da6707628539f9b1256f6c3.tar.bz2 nixpkgs-a84278aee5fa0cfb0da6707628539f9b1256f6c3.tar.lz nixpkgs-a84278aee5fa0cfb0da6707628539f9b1256f6c3.tar.xz nixpkgs-a84278aee5fa0cfb0da6707628539f9b1256f6c3.tar.zst nixpkgs-a84278aee5fa0cfb0da6707628539f9b1256f6c3.zip | |
filezilla: use wxGTK30-gtk3 instead of local override
| -rw-r--r-- | pkgs/applications/networking/ftp/filezilla/default.nix | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 96a4227b36e..04f0296fe82 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -10,16 +10,10 @@ , pugixml , sqlite , tinyxml -, wxGTK30 +, wxGTK30-gtk3 , 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.48.1"; @@ -52,8 +46,8 @@ stdenv.mkDerivation rec { pugixml sqlite tinyxml - wxgtk' - wxgtk'.gtk + wxGTK30-gtk3 + wxGTK30-gtk3.gtk xdg_utils ]; |