diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2019-05-26 06:38:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-26 06:38:20 -0400 |
| commit | bfc2ea774e8a12f9de843549e28a7a2e183b8ba6 (patch) | |
| tree | 69c8076f0f404807a9c84aa6d091695b9f990293 | |
| parent | fa6c93abe5c6c2106791ee51267a65dc7bd066d5 (diff) | |
| parent | 370a81d88f4c547ee1136420506e0dcdbc753d3a (diff) | |
| download | nixpkgs-bfc2ea774e8a12f9de843549e28a7a2e183b8ba6.tar nixpkgs-bfc2ea774e8a12f9de843549e28a7a2e183b8ba6.tar.gz nixpkgs-bfc2ea774e8a12f9de843549e28a7a2e183b8ba6.tar.bz2 nixpkgs-bfc2ea774e8a12f9de843549e28a7a2e183b8ba6.tar.lz nixpkgs-bfc2ea774e8a12f9de843549e28a7a2e183b8ba6.tar.xz nixpkgs-bfc2ea774e8a12f9de843549e28a7a2e183b8ba6.tar.zst nixpkgs-bfc2ea774e8a12f9de843549e28a7a2e183b8ba6.zip | |
Merge pull request #62057 from minijackson/waybar-0.6.6
spdlog: 1.2.1 -> 1.3.1 ; waybar: 0.6.5 -> 0.6.6
| -rw-r--r-- | pkgs/applications/misc/waybar/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/spdlog/default.nix | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index cdd78866cdc..4857a7458e2 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, pkgconfig, ninja -, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt +, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, spdlog , traySupport ? true, libdbusmenu-gtk3 , pulseSupport ? false, libpulseaudio , nlSupport ? true, libnl @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { name = "waybar-${version}"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "1k3ynx5ssq7ji0nlx0n7zrgrshxv5abj8fa8c5lcyxr2wxffna9z"; + sha256 = "0wxd03lkgssz0vsib9qc040vfg1i6nrg7ac2c6qwficx62j2zlm1"; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ ]; buildInputs = with stdenv.lib; - [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt ] + [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog ] ++ optional traySupport libdbusmenu-gtk3 ++ optional pulseSupport libpulseaudio ++ optional nlSupport libnl diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 198c61d37b5..c746925150b 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -15,7 +15,7 @@ let nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=OFF" ]; + cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=OFF" "-DSPDLOG_BUILD_BENCH=OFF" ]; outputs = [ "out" "doc" ]; @@ -35,8 +35,8 @@ let in { spdlog_1 = generic { - version = "1.2.1"; - sha256 = "0gdj8arfz4r9419zbcxk9y9nv47qr7kyjjzw9m3ijgmn2pmxk88n"; + version = "1.3.1"; + sha256 = "1rd4zmrlkcdjx0m0wpmjm1g9srj7jak6ai08qkhbn2lsn0niifzd"; }; spdlog_0 = generic { |