summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-10-12 11:28:28 +0100
committerGitHub <noreply@github.com>2017-10-12 11:28:28 +0100
commit1c9863aafebb67b47c48b453973c75bc38798a98 (patch)
treebcb0def62161b22052ec88ef643d577eea61ee24
parent8bff56c09cbfb65d96513409075b0e5d8e6be28f (diff)
parentb23b545942dcd70c12449f2f4bc106bf78e9d2ec (diff)
downloadnixlib-1c9863aafebb67b47c48b453973c75bc38798a98.tar
nixlib-1c9863aafebb67b47c48b453973c75bc38798a98.tar.gz
nixlib-1c9863aafebb67b47c48b453973c75bc38798a98.tar.bz2
nixlib-1c9863aafebb67b47c48b453973c75bc38798a98.tar.lz
nixlib-1c9863aafebb67b47c48b453973c75bc38798a98.tar.xz
nixlib-1c9863aafebb67b47c48b453973c75bc38798a98.tar.zst
nixlib-1c9863aafebb67b47c48b453973c75bc38798a98.zip
Merge pull request #30343 from Ma27/update-yabar-unstable
yabar-unstable: 2017-09-09 -> 2017-10-12
-rw-r--r--pkgs/applications/window-managers/yabar/build.nix4
-rw-r--r--pkgs/applications/window-managers/yabar/unstable.nix6
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix
index a5d02093e3f6..5e92c52e521b 100644
--- a/pkgs/applications/window-managers/yabar/build.nix
+++ b/pkgs/applications/window-managers/yabar/build.nix
@@ -2,6 +2,7 @@
 , xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl
 , configFile ? null, lib
 , rev, sha256, version
+, playerctl
 }:
 
 stdenv.mkDerivation {
@@ -20,6 +21,7 @@ stdenv.mkDerivation {
   buildInputs = [
     cairo gdk_pixbuf libconfig pango xcbutilwm docbook_xsl
     alsaLib wirelesstools asciidoc libxslt makeWrapper
+    playerctl
   ];
 
   postPatch = ''
@@ -28,7 +30,7 @@ stdenv.mkDerivation {
       --replace "a2x" "${asciidoc}/bin/a2x --no-xmllint"
   '';
 
-  makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ];
+  makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" "PLAYERCTL=1" ];
 
   postInstall = ''
     mkdir -p $out/share/yabar/examples
diff --git a/pkgs/applications/window-managers/yabar/unstable.nix b/pkgs/applications/window-managers/yabar/unstable.nix
index 6baa7ae5c036..b704c480d668 100644
--- a/pkgs/applications/window-managers/yabar/unstable.nix
+++ b/pkgs/applications/window-managers/yabar/unstable.nix
@@ -2,9 +2,9 @@
 
 let
   overrides = {
-    version = "unstable-2017-09-09";
+    version = "unstable-2017-10-12";
 
-    rev    = "d3934344ba27f5bdf122bf74daacee6d49284dab";
-    sha256 = "14zrlzva8i83ffg426mrf6yli8afwq6chvc7yi78ngixyik5gzhx";
+    rev    = "cbecc7766e37f29d50705da0a82dc76ce7c3b86e";
+    sha256 = "1wprjas3k14rxfl06mgr0xq2ra735w1c7dq4xrdvii887wnl37xb";
   } // attrs;
 in callPackage ./build.nix overrides