From 0761e74c384dad1d3f0ad6aae1c4e80fddab7985 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 10 Sep 2017 11:17:46 +0200
Subject: yabar: cleanup derivation

The latest changes from `yabar` require several
changes in the derivation to build the
package successfully.
---
 .../applications/window-managers/yabar/default.nix | 31 ++++++++++++----------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'pkgs/applications/window-managers/yabar')

diff --git a/pkgs/applications/window-managers/yabar/default.nix b/pkgs/applications/window-managers/yabar/default.nix
index 34d42425253..ae9eca8e3f2 100644
--- a/pkgs/applications/window-managers/yabar/default.nix
+++ b/pkgs/applications/window-managers/yabar/default.nix
@@ -1,38 +1,41 @@
-{ stdenv, fetchFromGitHub, cairo, gdk_pixbuf, libconfig, pango, pkgconfig, xcbutilwm }:
+{ stdenv, fetchFromGitHub, cairo, gdk_pixbuf, libconfig, pango, pkgconfig
+, xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt
+}:
 
 stdenv.mkDerivation rec {
   name    = "yabar-${version}";
-  version = "0.4.0";
+  version = "2017-09-09";
 
   src = fetchFromGitHub {
     owner  = "geommer";
     repo   = "yabar";
-    rev    = "746387f0112f9b7aa2e2e27b3d69cb2892d8c63b";
-    sha256 = "1nw9dar1caqln5fr0dqk7dg6naazbpfwwzxwlkxz42shsc3w30a6";
+    rev    = "d3934344ba27f5bdf122bf74daacee6d49284dab";
+    sha256 = "14zrlzva8i83ffg426mrf6yli8afwq6chvc7yi78ngixyik5gzhx";
   };
 
-  buildInputs = [ cairo gdk_pixbuf libconfig pango pkgconfig xcbutilwm ];
-
-  hardeningDisable = [ "format" ];
+  buildInputs = [
+    cairo gdk_pixbuf libconfig pango pkgconfig xcbutilwm
+    alsaLib wirelesstools asciidoc libxslt
+  ];
 
   postPatch = ''
-    substituteInPlace ./Makefile --replace "\$(shell git describe)" "${version}"
+    substituteInPlace ./Makefile \
+      --replace "\$(shell git describe)" "${version}" \
+      --replace "a2x" "${asciidoc}/bin/a2x --no-xmllint"
   '';
 
-  buildPhase = ''
-    make DESTDIR=$out PREFIX=/
-  '';
+  makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ];
 
-  installPhase = ''
-    make DESTDIR=$out PREFIX=/ install
+  postInstall = ''
     mkdir -p $out/share/yabar/examples
     cp -v examples/*.config $out/share/yabar/examples
   '';
 
   meta = with stdenv.lib; {
     description = "A modern and lightweight status bar for X window managers";
-    homepage    = "https://github.com/geommer/yabar";
+    homepage    = https://github.com/geommer/yabar;
     license     = licenses.mit;
     platforms   = platforms.linux;
+    maintainers = with maintainers; [ ma27 ];
   };
 }
-- 
cgit 1.4.1