mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Merge pull request #30343 from Ma27/update-yabar-unstable
yabar-unstable: 2017-09-09 -> 2017-10-12
This commit is contained in:
commit
1c9863aafe
2 changed files with 6 additions and 4 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue