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

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

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

- Fixed missprint (https://github.com/geommer/yabar/commit/f1b1eff48108654219311e63147365cd6f006593)
- Update information on Debian installation (https://github.com/geommer/yabar/commit/ce20fe75f7bca2488168e45c577d6bb4996f7377)
- Add indicator to show current indicator using `libxkbcommon` (https://github.com/geommer/yabar/commit/5aa1fb5eb558f58f0bcfe495b8f49414aa6d88a2)

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
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/window-managers/yabar/build.nix
+1 -3
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
pkgs/applications/window-managers/yabar/unstable.nix
+15 -7
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"
];
})