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

Merge pull request #33317 from Ma27/update-yabar

Browse Source 
yabar-unstable: 2017-10-12 -> 2018-01-02
This commit is contained in:
adisbladis 2018-01-02 11:47:47 +01:00 committed by GitHub
commit aa0d820793
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 10 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,7 +2,6 @@
, 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 {
@ -21,7 +20,6 @@ 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 = ''
@ -30,7 +28,7 @@ stdenv.mkDerivation {
--replace "a2x" "${asciidoc}/bin/a2x --no-xmllint" --replace "a2x" "${asciidoc}/bin/a2x --no-xmllint"
''; '';
makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" "PLAYERCTL=1" ]; makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ];
postInstall = '' postInstall = ''
mkdir -p $out/share/yabar/examples mkdir -p $out/share/yabar/examples

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

@ -1,10 +1,18 @@
{ callPackage, attrs ? {} }: { playerctl, libxkbcommon, callPackage, attrs ? {} }:
let let
overrides = { pkg = callPackage ./build.nix ({
version = "unstable-2017-10-12"; version = "unstable-2018-01-02";
rev = "cbecc7766e37f29d50705da0a82dc76ce7c3b86e"; rev = "d9f75933f1fdd7bec24bf7db104c7e1df2728b98";
sha256 = "1wprjas3k14rxfl06mgr0xq2ra735w1c7dq4xrdvii887wnl37xb"; sha256 = "0ry2pgqsnl6cmvkhakm73cjqdnirkimldnmbngl6hbvggx32z8c9";
} // attrs; } // attrs);
in callPackage ./build.nix overrides in pkg.overrideAttrs (o: {
buildInputs = o.buildInputs ++ [
playerctl libxkbcommon
];
makeFlags = o.makeFlags ++ [
"PLAYERCTL=1"
];
})