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

Merge pull request #62057 from minijackson/waybar-0.6.6

Browse Source 
spdlog: 1.2.1 -> 1.3.1 ; waybar: 0.6.5 -> 0.6.6
This commit is contained in:
Aaron Andersen 2019-05-26 06:38:20 -04:00 committed by GitHub
commit bfc2ea774e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/misc/waybar/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja { stdenv, fetchFromGitHub, meson, pkgconfig, ninja
, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt , wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, spdlog
, traySupport ? true, libdbusmenu-gtk3 , traySupport ? true, libdbusmenu-gtk3
, pulseSupport ? false, libpulseaudio , pulseSupport ? false, libpulseaudio
, nlSupport ? true, libnl , nlSupport ? true, libnl
@ -9,13 +9,13 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "waybar-${version}"; name = "waybar-${version}";
version = "0.6.5"; version = "0.6.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Alexays"; owner = "Alexays";
repo = "Waybar"; repo = "Waybar";
rev = version; rev = version;
sha256 = "1k3ynx5ssq7ji0nlx0n7zrgrshxv5abj8fa8c5lcyxr2wxffna9z"; sha256 = "0wxd03lkgssz0vsib9qc040vfg1i6nrg7ac2c6qwficx62j2zlm1";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -23,7 +23,7 @@
]; ];
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt ] [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog ]
++ optional traySupport libdbusmenu-gtk3 ++ optional traySupport libdbusmenu-gtk3
++ optional pulseSupport libpulseaudio ++ optional pulseSupport libpulseaudio
++ optional nlSupport libnl ++ optional nlSupport libnl

6
pkgs/development/libraries/spdlog/default.nix
View File

@ -15,7 +15,7 @@ let
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=OFF" ]; cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=OFF" "-DSPDLOG_BUILD_BENCH=OFF" ];
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];
@ -35,8 +35,8 @@ let
in in
{ {
spdlog_1 = generic { spdlog_1 = generic {
version = "1.2.1"; version = "1.3.1";
sha256 = "0gdj8arfz4r9419zbcxk9y9nv47qr7kyjjzw9m3ijgmn2pmxk88n"; sha256 = "1rd4zmrlkcdjx0m0wpmjm1g9srj7jak6ai08qkhbn2lsn0niifzd";
}; };
spdlog_0 = generic { spdlog_0 = generic {