yabar-unstable: 2017-10-12 -> 2018-01-02

The unstable branch of `yabar` received some minor useful changes:

- Fixed missprint (f1b1eff481)
- Update information on Debian installation (ce20fe75f7)
- Add indicator to show current indicator using `libxkbcommon` (5aa1fb5eb5)

The last change requires a `libxkbcommon` as additional build input.

Furthermore I thought that it might be better to add the dependencies of
unstable (namely `playerctl` and `libxkbcommon`) to the `unstable.nix`
to reduce the closure size of the stable build.
This commit is contained in:
Maximilian Bosch 2018-01-02 10:30:49 +01:00
parent 3d692437c4
commit bd40601acb
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
2 changed files with 16 additions and 10 deletions

View File

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

View File

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