diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 8a9b72265b99..49894bd0daa2 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,41 +1,79 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gettext -, which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp -, libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig }: +{ 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"; - 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 ]; - - buildInputs = [ - libX11 - libXext - libXinerama - libXpm - libXft - xorg.libXrender - libXau - libXdmcp - libXmu - libpng - libjpeg - expat - xorgproto - librsvg - freetype - fontconfig + nativeBuildInputs = [ + autoconf + automake + gettext + pkg-config + which ]; + buildInputs = [ + expat + fontconfig + freetype + libX11 + libXau + libXdmcp + libXext + libXft + libXinerama + libXmu + libXpm + libjpeg + libpng + librsvg + pango + xorg.libXrender + xorgproto + ]; + + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + 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";