JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #145024 from romildo/upd.jwm

Browse Source 
jwm: 1685 -> 2.4.0
This commit is contained in:
José Romildo Malaquias 2021-11-08 18:52:30 -03:00 committed by GitHub
commit 0f41094088
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +0,0 @@
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"
############################################################################

16
pkgs/applications/window-managers/jwm/default.nix
View File

@ -1,21 +1,19 @@
{ 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
@ -38,12 +36,10 @@ stdenv.mkDerivation rec {
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 ];
};