From a3214953f165d85f89eec4deb182625cecd589d5 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 21 Dec 2021 19:42:54 +0000 Subject: [PATCH] i3status: 2.13 -> 2.14 --- pkgs/applications/window-managers/i3/status.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index bbbad532d096..40666b2d2057 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -1,24 +1,17 @@ -{ fetchurl, lib, stdenv, libconfuse, yajl, alsa-lib, libpulseaudio, libnl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: +{ fetchurl, lib, stdenv, libconfuse, yajl, alsa-lib, libpulseaudio, libnl, meson, ninja, perl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: stdenv.mkDerivation rec { pname = "i3status"; - version = "2.13"; + version = "2.14"; src = fetchurl { - url = "https://i3wm.org/i3status/i3status-${version}.tar.bz2"; - sha256 = "0rhlzb96mw64z2jnhwz9nibc7pxg549626lz5642xxk5hpzwk2ff"; + url = "https://i3wm.org/i3status/i3status-${version}.tar.xz"; + sha256 = "0929chhvyq9hg4scpcz8r9zn3s9jvbg6a86k3wqa77qg85rh4kaw"; }; - nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; + nativeBuildInputs = [ meson ninja perl pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; buildInputs = [ libconfuse yajl alsa-lib libpulseaudio libnl ]; - makeFlags = [ "all" "PREFIX=$(out)" ]; - - # This hack is needed because for unknown reasons configure generates a broken makefile on the 2.13 release under nixos - preBuild = '' - sed -i -e 's/\$(TEST_LOGS) \$(TEST_LOGS/\$(TEST_LOGS)/g' Makefile - ''; - meta = { description = "Generates a status line for i3bar, dzen2, xmobar or lemonbar"; homepage = "https://i3wm.org";