summary refs log tree commit diff
path: root/pkgs/applications/window-managers/i3
diff options
context:
space:
mode:
authorReno Reckling <exi@wthack.de>2019-09-08 01:16:38 +0200
committerReno Reckling <exi@wthack.de>2019-09-08 01:16:38 +0200
commit8f6cdc6daf637da3424ed2f7fdd7717762d71274 (patch)
treeaf5075e5536508e0d7bda21ef2e915f5799cebe6 /pkgs/applications/window-managers/i3
parent03deb7cd50cd85181adb18a9f47e9ce40874fd8a (diff)
downloadnixpkgs-8f6cdc6daf637da3424ed2f7fdd7717762d71274.tar
nixpkgs-8f6cdc6daf637da3424ed2f7fdd7717762d71274.tar.gz
nixpkgs-8f6cdc6daf637da3424ed2f7fdd7717762d71274.tar.bz2
nixpkgs-8f6cdc6daf637da3424ed2f7fdd7717762d71274.tar.lz
nixpkgs-8f6cdc6daf637da3424ed2f7fdd7717762d71274.tar.xz
nixpkgs-8f6cdc6daf637da3424ed2f7fdd7717762d71274.tar.zst
nixpkgs-8f6cdc6daf637da3424ed2f7fdd7717762d71274.zip
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.
Diffstat (limited to 'pkgs/applications/window-managers/i3')
-rw-r--r--pkgs/applications/window-managers/i3/status.nix14
1 files 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;