diff --git a/pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch b/pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch new file mode 100644 index 00000000000..f7b6a4cb9f1 --- /dev/null +++ b/pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch @@ -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" + + ############################################################################ diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 601cf3cded6..61ea1b28273 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchFromGitHub, pkgconfig, automake, autoconf, libtool, - gettext, which, xorg, libX11, libXext, libXinerama, libXpm, libXft, - libXau, libXdmcp, libXmu, libpng, libjpeg, expat, xorgproto, - librsvg, freetype, fontconfig }: +{ stdenv, fetchFromGitHub, pkgconfig, automake, autoconf, libtool, 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"; - + src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; @@ -14,11 +13,28 @@ stdenv.mkDerivation rec { sha256 = "1kyvy022sij898g2hm5spy5vq0kw6aqd7fsnawl2xyh06gwh29wg"; }; + patches = [ ./0001-Fix-Gettext-Requirement.patch ]; + nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; - buildInputs = [ libX11 libXext libXinerama libXpm libXft xorg.libXrender - libXau libXdmcp libXmu libpng libjpeg expat xorgproto - librsvg freetype fontconfig ]; + buildInputs = [ + libX11 + libXext + libXinerama + libXpm + libXft + xorg.libXrender + libXau + libXdmcp + libXmu + libpng + libjpeg + expat + xorgproto + librsvg + freetype + fontconfig + ]; enableParallelBuilding = true; @@ -28,7 +44,7 @@ stdenv.mkDerivation rec { homepage = "http://joewing.net/projects/jwm/"; description = "Joe's Window Manager is a light-weight X11 window manager"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; }; }