commit 0f410940884437e4337e8f5d2ec3f7b702a7a836

pyrox.dev / nixpkgs

lol

fork atom

Merge pull request #145024 from romildo/upd.jwm

jwm: 1685 -> 2.4.0

authored by

José Romildo Malaquias and committed by

GitHub 4 years ago 0f410940 8605fbd7

+6 -24

2 changed files

expand all

unified split

pkgs

applications

window-managers

jwm

0001-Fix-Gettext-Requirement.patch

default.nix

-14

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

··· 1 - diff --git a/configure.ac b/configure.ac 2 - index 347d325..dce95a0 100644 3 - --- a/configure.ac 4 - +++ b/configure.ac 5 - @@ -489,7 +489,8 @@ fi 6 - ############################################################################ 7 - AM_ICONV 8 - AM_GNU_GETTEXT([external]) 9 - -AM_GNU_GETTEXT_VERSION([0.19]) 10 - +AM_GNU_GETTEXT_VERSION([0.19.6]) 11 - +AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6]) 12 - LDFLAGS="$LDFLAGS $LIBINTL $LIBICONV" 13 - 14 - ############################################################################

···

+6 -10

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

··· 1 - { lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf, libtool, gettext 2 , which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp 3 , libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig }: 4 5 stdenv.mkDerivation rec { 6 pname = "jwm"; 7 - version = "1685"; 8 9 src = fetchFromGitHub { 10 owner = "joewing"; 11 repo = "jwm"; 12 - rev = "s${version}"; 13 - sha256 = "1kyvy022sij898g2hm5spy5vq0kw6aqd7fsnawl2xyh06gwh29wg"; 14 }; 15 16 - patches = [ ./0001-Fix-Gettext-Requirement.patch ]; 17 - 18 - nativeBuildInputs = [ pkg-config automake autoconf libtool gettext which ]; 19 20 buildInputs = [ 21 libX11 ··· 38 39 enableParallelBuilding = true; 40 41 - preConfigure = "./autogen.sh"; 42 - 43 meta = { 44 homepage = "http://joewing.net/projects/jwm/"; 45 description = "Joe's Window Manager is a light-weight X11 window manager"; 46 - license = lib.licenses.gpl2; 47 platforms = lib.platforms.unix; 48 maintainers = [ lib.maintainers.romildo ]; 49 };

··· 1 + { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gettext 2 , which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp 3 , libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig }: 4 5 stdenv.mkDerivation rec { 6 pname = "jwm"; 7 + version = "2.4.0"; 8 9 src = fetchFromGitHub { 10 owner = "joewing"; 11 repo = "jwm"; 12 + rev = "v${version}"; 13 + sha256 = "19fnrlw05njib13ljh7pmi48myfclra1xhy4b6hi74c6w6yz2fgj"; 14 }; 15 16 + nativeBuildInputs = [ pkg-config gettext which autoreconfHook ]; 17 18 buildInputs = [ 19 libX11 ··· 36 37 enableParallelBuilding = true; 38 39 meta = { 40 homepage = "http://joewing.net/projects/jwm/"; 41 description = "Joe's Window Manager is a light-weight X11 window manager"; 42 + license = lib.licenses.mit; 43 platforms = lib.platforms.unix; 44 maintainers = [ lib.maintainers.romildo ]; 45 };