jwm: fix gettext requirement
Jwm requests a specific version of gettext. Since the current version of gettext is higher, the build fails. Gettext supports to request a minimum version (since 0.19.6). A patch is introduces which requests the minimum version 0.19.6.gstqt5
parent
969c5d7fb2
commit
1a22a73dde
|
@ -0,0 +1,14 @@
|
||||||
|
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"
|
||||||
|
|
||||||
|
############################################################################
|
|
@ -1,12 +1,11 @@
|
||||||
{ stdenv, fetchFromGitHub, pkgconfig, automake, autoconf, libtool,
|
{ stdenv, fetchFromGitHub, pkgconfig, automake, autoconf, libtool, gettext
|
||||||
gettext, which, xorg, libX11, libXext, libXinerama, libXpm, libXft,
|
, which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp
|
||||||
libXau, libXdmcp, libXmu, libpng, libjpeg, expat, xorgproto,
|
, libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig }:
|
||||||
librsvg, freetype, fontconfig }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "jwm";
|
pname = "jwm";
|
||||||
version = "1685";
|
version = "1685";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "joewing";
|
owner = "joewing";
|
||||||
repo = "jwm";
|
repo = "jwm";
|
||||||
|
@ -14,11 +13,28 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1kyvy022sij898g2hm5spy5vq0kw6aqd7fsnawl2xyh06gwh29wg";
|
sha256 = "1kyvy022sij898g2hm5spy5vq0kw6aqd7fsnawl2xyh06gwh29wg";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [ ./0001-Fix-Gettext-Requirement.patch ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];
|
nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];
|
||||||
|
|
||||||
buildInputs = [ libX11 libXext libXinerama libXpm libXft xorg.libXrender
|
buildInputs = [
|
||||||
libXau libXdmcp libXmu libpng libjpeg expat xorgproto
|
libX11
|
||||||
librsvg freetype fontconfig ];
|
libXext
|
||||||
|
libXinerama
|
||||||
|
libXpm
|
||||||
|
libXft
|
||||||
|
xorg.libXrender
|
||||||
|
libXau
|
||||||
|
libXdmcp
|
||||||
|
libXmu
|
||||||
|
libpng
|
||||||
|
libjpeg
|
||||||
|
expat
|
||||||
|
xorgproto
|
||||||
|
librsvg
|
||||||
|
freetype
|
||||||
|
fontconfig
|
||||||
|
];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
@ -28,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||||
homepage = "http://joewing.net/projects/jwm/";
|
homepage = "http://joewing.net/projects/jwm/";
|
||||||
description = "Joe's Window Manager is a light-weight X11 window manager";
|
description = "Joe's Window Manager is a light-weight X11 window manager";
|
||||||
license = stdenv.lib.licenses.gpl2;
|
license = stdenv.lib.licenses.gpl2;
|
||||||
platforms = stdenv.lib.platforms.unix;
|
platforms = stdenv.lib.platforms.unix;
|
||||||
maintainers = [ stdenv.lib.maintainers.romildo ];
|
maintainers = [ stdenv.lib.maintainers.romildo ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue