From 8c2fa7b5aeb1d6b287422fb8c01229f98f48618d Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sun, 22 Aug 2021 12:35:46 +0200 Subject: [PATCH] poedit: 2.4.3 -> 3.0 --- pkgs/tools/text/poedit/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index 9a5226d98b27..c53f521fddc4 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK31-gtk3, boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml, nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "poedit"; - version = "2.4.3"; + version = "3.0"; src = fetchFromGitHub { owner = "vslavik"; repo = "poedit"; rev = "v${version}-oss"; - sha256 = "02xf2w3d2lnr3vqmil9vvg9pir7d21x4zrj9xwpgb7dhs0gimj0x"; + sha256 = "0bxhyxsa641ip6wab9ms9g4w6mb1bv46y5h5b436spl5c70rcn4z"; }; nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook libxslt xmlto boost libtool pkg-config ]; - buildInputs = [ lucenepp nlohmann_json wxGTK30-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ]; + buildInputs = [ lucenepp nlohmann_json wxGTK31-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ]; propagatedBuildInputs = [ gettext ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33a51b7f67a0..9503ffc2aa8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8175,7 +8175,9 @@ with pkgs; pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; - poedit = callPackage ../tools/text/poedit { }; + poedit = callPackage ../tools/text/poedit { + wxGTK31-gtk3 = wxGTK31-gtk3.override { withWebKit = true; }; + }; polipo = callPackage ../servers/polipo { };