diff --git a/pkgs/by-name/ya/yad/gettext-0.25.patch b/pkgs/by-name/ya/yad/gettext-0.25.patch deleted file mode 100644 index 02f551459ef9..000000000000 --- a/pkgs/by-name/ya/yad/gettext-0.25.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 20a4e42..921ba18 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8,9 +8,13 @@ AC_PREREQ([2.59]) - - AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_SRCDIR([src]) -+AC_CONFIG_MACRO_DIRS([m4]) - - AM_MAINTAINER_MODE - -+AM_GNU_GETTEXT_VERSION([0.25]) -+AM_GNU_GETTEXT([external]) -+ - IT_PROG_INTLTOOL([0.40.0]) - - AC_PROG_CC diff --git a/pkgs/by-name/ya/yad/package.nix b/pkgs/by-name/ya/yad/package.nix index 1eb72440e0b2..39fff868cf82 100644 --- a/pkgs/by-name/ya/yad/package.nix +++ b/pkgs/by-name/ya/yad/package.nix @@ -3,44 +3,53 @@ stdenv, fetchFromGitHub, pkg-config, - intltool, autoreconfHook, wrapGAppsHook3, + gettext, + gspell, gtk3, - hicolor-icon-theme, + gtksourceview, + libappindicator-gtk3, netpbm, + webkitgtk_4_1, }: stdenv.mkDerivation (finalAttrs: { pname = "yad"; - version = "14.1"; + version = "15.0"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-Y7bp20fkNdSgBcSV1kPEpWEP7ASwZcScVRaPauwI72M="; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-z+t4eG8yXhfs4GfLFDaaOCAxrr5MIoFD6BKF8vr59IY="; }; - # FIXME: remove when gettext is fixed - patches = [ ./gettext-0.25.patch ]; - configureFlags = [ - "--enable-icon-browser" - "--with-gtk=gtk3" "--with-rgb=${placeholder "out"}/share/yad/rgb.txt" + "--enable-html" + "--enable-tray" + "--enable-appindicator" + "--enable-spell" + "--enable-sourceview" + "--enable-deprecated" + "--enable-tools" + "--enable-icon-browser" ]; buildInputs = [ + gspell gtk3 - hicolor-icon-theme + gtksourceview + libappindicator-gtk3 + webkitgtk_4_1 ]; nativeBuildInputs = [ autoreconfHook pkg-config - intltool wrapGAppsHook3 + gettext ]; postPatch = '' @@ -51,10 +60,6 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 ${netpbm.out}/share/netpbm/misc/rgb.txt $out/share/yad/rgb.txt ''; - postAutoreconf = '' - intltoolize - ''; - meta = { homepage = "https://github.com/v1cont/yad"; description = "GUI dialog tool for shell scripts"; @@ -66,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3; mainProgram = "yad"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ RoGreat ]; platforms = with lib.platforms; linux; }; })