From 889c8592d52bdc90f9363f2d89b2388b618fe3cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Sun, 29 May 2022 10:48:29 -0300
Subject: [PATCH 1/3] jwm: 2.4.1 -> 2.4.2

---
 pkgs/applications/window-managers/jwm/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 8a9b72265b99..d4271f4f6e39 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -1,19 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gettext
+{ lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf, gettext
 , which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp
-, libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig }:
+, libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig, pango }:
 
 stdenv.mkDerivation rec {
   pname = "jwm";
-  version = "2.4.1";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "joewing";
     repo = "jwm";
     rev = "v${version}";
-    sha256 = "sha256-7CEL2ddlABM7SYjMVUs3pu0O+2cVsz04slsdUIbgZuM=";
+    sha256 = "sha256-rvuz2Pmon3XBqRMgDwZNrQlWDyLNSK30JPmmQTlN+Rs=";
   };
 
-  nativeBuildInputs = [ pkg-config gettext which autoreconfHook ];
+  nativeBuildInputs = [ pkg-config gettext which automake autoconf ];
 
   buildInputs = [
     libX11
@@ -32,8 +32,11 @@ stdenv.mkDerivation rec {
     librsvg
     freetype
     fontconfig
+    pango
   ];
 
+  preConfigure = "NOCONFIGURE=1 ./autogen.sh";
+
   enableParallelBuilding = true;
 
   meta = {

From ea4692000b1dbb96a6d4ccac296a5c53c5f9bb67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Sun, 29 May 2022 11:33:09 -0300
Subject: [PATCH 2/3] jwm: add update script

---
 pkgs/applications/window-managers/jwm/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index d4271f4f6e39..3f3cfd045bb6 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -1,6 +1,7 @@
 { lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf, gettext
 , which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp
-, libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig, pango }:
+, libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig, pango
+, gitUpdater }:
 
 stdenv.mkDerivation rec {
   pname = "jwm";
@@ -39,6 +40,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  passthru.updateScript = gitUpdater {
+    inherit pname version;
+    rev-prefix = "v";
+  };
+
   meta = {
     homepage = "http://joewing.net/projects/jwm/";
     description = "Joe's Window Manager is a light-weight X11 window manager";

From 02aa3bff8c65e7f42326c4a7977708764208c5f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Sun, 29 May 2022 11:36:50 -0300
Subject: [PATCH 3/3] jwm: reformat

---
 .../window-managers/jwm/default.nix           | 59 ++++++++++++++-----
 1 file changed, 44 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 3f3cfd045bb6..49894bd0daa2 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -1,7 +1,30 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf, gettext
-, which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp
-, libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig, pango
-, gitUpdater }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoconf
+, automake
+, expat
+, fontconfig
+, freetype
+, gettext
+, libX11
+, libXau
+, libXdmcp
+, libXext
+, libXft
+, libXinerama
+, libXmu
+, libXpm
+, libjpeg
+, libpng
+, librsvg
+, pango
+, pkg-config
+, which
+, xorg
+, xorgproto
+, gitUpdater
+}:
 
 stdenv.mkDerivation rec {
   pname = "jwm";
@@ -14,26 +37,32 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-rvuz2Pmon3XBqRMgDwZNrQlWDyLNSK30JPmmQTlN+Rs=";
   };
 
-  nativeBuildInputs = [ pkg-config gettext which automake autoconf ];
+  nativeBuildInputs = [
+    autoconf
+    automake
+    gettext
+    pkg-config
+    which
+  ];
 
   buildInputs = [
+    expat
+    fontconfig
+    freetype
     libX11
-    libXext
-    libXinerama
-    libXpm
-    libXft
-    xorg.libXrender
     libXau
     libXdmcp
+    libXext
+    libXft
+    libXinerama
     libXmu
-    libpng
+    libXpm
     libjpeg
-    expat
-    xorgproto
+    libpng
     librsvg
-    freetype
-    fontconfig
     pango
+    xorg.libXrender
+    xorgproto
   ];
 
   preConfigure = "NOCONFIGURE=1 ./autogen.sh";