public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30343 from Ma27/update-yabar-unstable

Browse Source 
yabar-unstable: 2017-09-09 -> 2017-10-12
This commit is contained in:
Jörg Thalheim 2017-10-12 11:28:28 +01:00 committed by GitHub
commit 1c9863aafe
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/window-managers/yabar/build.nix
View File

@ -2,6 +2,7 @@
, xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl , xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl
, configFile ? null, lib , configFile ? null, lib
, rev, sha256, version , rev, sha256, version
, playerctl
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -20,6 +21,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
cairo gdk_pixbuf libconfig pango xcbutilwm docbook_xsl cairo gdk_pixbuf libconfig pango xcbutilwm docbook_xsl
alsaLib wirelesstools asciidoc libxslt makeWrapper alsaLib wirelesstools asciidoc libxslt makeWrapper
playerctl
]; ];
postPatch = '' postPatch = ''
@ -28,7 +30,7 @@ stdenv.mkDerivation {
--replace "a2x" "${asciidoc}/bin/a2x --no-xmllint" --replace "a2x" "${asciidoc}/bin/a2x --no-xmllint"
''; '';
makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ]; makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" "PLAYERCTL=1" ];
postInstall = '' postInstall = ''
mkdir -p $out/share/yabar/examples mkdir -p $out/share/yabar/examples

6
pkgs/applications/window-managers/yabar/unstable.nix
View File

@ -2,9 +2,9 @@
let let
overrides = { overrides = {
version = "unstable-2017-09-09"; version = "unstable-2017-10-12";
rev = "d3934344ba27f5bdf122bf74daacee6d49284dab"; rev = "cbecc7766e37f29d50705da0a82dc76ce7c3b86e";
sha256 = "14zrlzva8i83ffg426mrf6yli8afwq6chvc7yi78ngixyik5gzhx"; sha256 = "1wprjas3k14rxfl06mgr0xq2ra735w1c7dq4xrdvii887wnl37xb";
} // attrs; } // attrs;
in callPackage ./build.nix overrides in callPackage ./build.nix overrides