Merge pull request #145024 from romildo/upd.jwm

jwm: 1685 -> 2.4.0

pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch

···
-diff --git a/configure.ac b/configure.ac
-index 347d325..dce95a0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -489,7 +489,8 @@ fi
- ############################################################################
- AM_ICONV
- AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.19])
-+AM_GNU_GETTEXT_VERSION([0.19.6])
-+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6])
- LDFLAGS="$LDFLAGS $LIBINTL $LIBICONV"
- 
- ############################################################################

pkgs/applications/window-managers/jwm/default.nix

···
-{ lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf, libtool, gettext
+{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gettext
 , which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp
 , libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig }:
 
 stdenv.mkDerivation rec {
   pname = "jwm";
-  version = "1685";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "joewing";
     repo = "jwm";
-    rev = "s${version}";
-    sha256 = "1kyvy022sij898g2hm5spy5vq0kw6aqd7fsnawl2xyh06gwh29wg";
+    rev = "v${version}";
+    sha256 = "19fnrlw05njib13ljh7pmi48myfclra1xhy4b6hi74c6w6yz2fgj";
   };
 
-  patches = [ ./0001-Fix-Gettext-Requirement.patch ];
-
-  nativeBuildInputs = [ pkg-config automake autoconf libtool gettext which ];
+  nativeBuildInputs = [ pkg-config gettext which autoreconfHook ];
 
   buildInputs = [
     libX11
···
 
   enableParallelBuilding = true;
 
-  preConfigure = "./autogen.sh";
-
   meta = {
     homepage = "http://joewing.net/projects/jwm/";
     description = "Joe's Window Manager is a light-weight X11 window manager";
-    license = lib.licenses.gpl2;
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = [ lib.maintainers.romildo ];
   };