diff options
| author | José Romildo <malaquias@gmail.com> | 2021-11-07 21:42:56 -0300 |
|---|---|---|
| committer | José Romildo <malaquias@gmail.com> | 2021-11-08 18:19:15 -0300 |
| commit | 4595cfb6229f168909238220a74ed4a22135a359 (patch) | |
| tree | 6a8d9241d362fa359cf7c5f997d538a7f2d095b8 /pkgs/applications/window-managers | |
| parent | 3fdd115b4bcee306886092e9551ab1f66465e1c0 (diff) | |
| download | nixpkgs-4595cfb6229f168909238220a74ed4a22135a359.tar nixpkgs-4595cfb6229f168909238220a74ed4a22135a359.tar.gz nixpkgs-4595cfb6229f168909238220a74ed4a22135a359.tar.bz2 nixpkgs-4595cfb6229f168909238220a74ed4a22135a359.tar.lz nixpkgs-4595cfb6229f168909238220a74ed4a22135a359.tar.xz nixpkgs-4595cfb6229f168909238220a74ed4a22135a359.tar.zst nixpkgs-4595cfb6229f168909238220a74ed4a22135a359.zip | |
jwm: 1685 -> 2.4.0
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch | 14 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/jwm/default.nix | 16 |
2 files changed, 6 insertions, 24 deletions
diff --git a/pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch b/pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch deleted file mode 100644 index f7b6a4cb9f1..00000000000 --- a/pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch +++ /dev/null @@ -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" - - ############################################################################ diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 3c97c5630b0..2c9461d6388 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -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 ]; }; |