From 8f6cdc6daf637da3424ed2f7fdd7717762d71274 Mon Sep 17 00:00:00 2001 From: Reno Reckling Date: Sun, 8 Sep 2019 01:16:38 +0200 Subject: [PATCH 1/2] i3status: 2.12 -> 2.13 Update i3status to 2.13. I needed to add a little hack to get it to build because for reasons I can't seem to figure out, the configure script generates a broken Makefile on this release. The small sed line fixes the syntax error. --- pkgs/applications/window-managers/i3/status.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 17b147da1b2..567ab26b4ec 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -1,19 +1,23 @@ -{ fetchurl, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig - }: +{ fetchurl, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: stdenv.mkDerivation rec { - name = "i3status-2.12"; + name = "i3status-2.13"; src = fetchurl { url = "https://i3wm.org/i3status/${name}.tar.bz2"; - sha256 = "06krpbijv4yi33nypg6qcn4hilcrdyarsdpd9fmr2cq46qaqiikg"; + sha256 = "0rhlzb96mw64z2jnhwz9nibc7pxg549626lz5642xxk5hpzwk2ff"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; buildInputs = [ libconfuse yajl alsaLib 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 = "A tiling window manager"; homepage = https://i3wm.org; From b553faa2a6c6924930a20eb86e98671140bb4a10 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 8 Sep 2019 10:23:14 +0200 Subject: [PATCH 2/2] i3status: fix description --- pkgs/applications/window-managers/i3/status.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 567ab26b4ec..e963259b624 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A tiling window manager"; + description = "Generates a status line for i3bar, dzen2, xmobar or lemonbar"; homepage = https://i3wm.org; maintainers = [ ]; license = stdenv.lib.licenses.bsd3;