diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/applications/window-managers/jwm | |
parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/applications/window-managers/jwm')
-rw-r--r-- | nixpkgs/pkgs/applications/window-managers/jwm/default.nix | 70 |
1 files changed, 54 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/applications/window-managers/jwm/default.nix b/nixpkgs/pkgs/applications/window-managers/jwm/default.nix index 8a9b72265b99..49894bd0daa2 100644 --- a/nixpkgs/pkgs/applications/window-managers/jwm/default.nix +++ b/nixpkgs/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 ]; + 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"; + 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"; |