summary refs log tree commit diff
path: root/pkgs/applications/window-managers/i3
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2021-12-21 19:42:54 +0000
committerSergei Trofimovich <slyich@gmail.com>2021-12-21 19:44:03 +0000
commita3214953f165d85f89eec4deb182625cecd589d5 (patch)
tree0231a8f737f4331ca84e6a1d3e151ebeae43c6c4 /pkgs/applications/window-managers/i3
parent1de43adf3106bbcee232a578e67ec2b0bb525a2f (diff)
downloadnixpkgs-a3214953f165d85f89eec4deb182625cecd589d5.tar
nixpkgs-a3214953f165d85f89eec4deb182625cecd589d5.tar.gz
nixpkgs-a3214953f165d85f89eec4deb182625cecd589d5.tar.bz2
nixpkgs-a3214953f165d85f89eec4deb182625cecd589d5.tar.lz
nixpkgs-a3214953f165d85f89eec4deb182625cecd589d5.tar.xz
nixpkgs-a3214953f165d85f89eec4deb182625cecd589d5.tar.zst
nixpkgs-a3214953f165d85f89eec4deb182625cecd589d5.zip
i3status: 2.13 -> 2.14
Diffstat (limited to 'pkgs/applications/window-managers/i3')
-rw-r--r--pkgs/applications/window-managers/i3/status.nix17
1 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
index bbbad532d09..40666b2d205 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";