git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #80417 from Ma27/fix-waybar

waybar: 0.9.0 -> 0.9.1, fix build

commit3c0b262ceef8bcbd57dcf90c5dafd93b4cf0f786 authorMaximilian Bosch <maximilian@mbosch.me> dateThu 20 Feb 2020, 01:50 (7 years ago) parent5e32ee989e2a43
3 files changed+46−4
pkgs/applications/misc/waybar/default.nix+6−4 pkgs/development/libraries/howard-hinnant-date/default.nix+38 pkgs/top-level/all-packages.nix+2
pkgs/applications/misc/waybar/default.nix+6−4
@@ -1,5 +1,6 @@
11{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, wrapGAppsHook
22, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell
3+, howard-hinnant-date, cmake
34, traySupport ? true, libdbusmenu-gtk3
45, pulseSupport ? false, libpulseaudio
56, nlSupport ? true, libnl
@@ -9,21 +10,21 @@
910}:
1011 stdenv.mkDerivation rec {
1112 pname = "waybar";
12− version = "0.9.0";
13+ version = "0.9.1";
1314
1415 src = fetchFromGitHub {
1516 owner = "Alexays";
1617 repo = "Waybar";
1718 rev = version;
18− sha256 = "1w8a6jih872ry288k8ic6mjfi9ccf1jwc24wnh9p5c7w73247c2c";
19+ sha256 = "0drlv8im5phz39jxp3gxkc40b6f85bb3piff2v3hmnfzh7ib915s";
1920 };
2021
2122 nativeBuildInputs = [
22− meson ninja pkgconfig scdoc wrapGAppsHook
23+ meson ninja pkgconfig scdoc wrapGAppsHook cmake
2324 ];
2425
2526 buildInputs = with stdenv.lib;
26− [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog gtk-layer-shell ]
27+ [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ]
2728 ++ optional traySupport libdbusmenu-gtk3
2829 ++ optional pulseSupport libpulseaudio
2930 ++ optional nlSupport libnl
@@ -50,5 +51,6 @@
5051 license = licenses.mit;
5152 maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ];
5253 platforms = platforms.unix;
54+ homepage = "https://github.com/alexays/waybar";
5355 };
5456 }
pkgs/development/libraries/howard-hinnant-date/default.nixnew file+38
@@ -0,0 +1,38 @@
1+{ stdenv, fetchFromGitHub, cmake, curl, fetchpatch }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "howard-hinnant-date-unstable";
5+ version = "2020-01-24";
6+
7+ src = fetchFromGitHub {
8+ owner = "HowardHinnant";
9+ repo = "date";
10+ rev = "9a0ee2542848ab8625984fc8cdbfb9b5414c0082";
11+ sha256 = "0yxsn0hj22n61bjywysxqgfv7hj5xvsl6isma95fl8xrimpny083";
12+ };
13+
14+ patches = [
15+ (fetchpatch {
16+ url = "https://github.com/HowardHinnant/date/commit/e56b2dce7e89a92e1b9b35caa13b3e938c4cedea.patch";
17+ sha256 = "0m3qbhq7kmm9qa3jm6d2px7c1dxdj5k9lffgdvqnrwmhxwj1p9n2";
18+ })
19+ ];
20+
21+ nativeBuildInputs = [ cmake ];
22+ buildInputs = [ curl ];
23+
24+ cmakeFlags = [
25+ "-DBUILD_TZ_LIB=true"
26+ "-DBUILD_SHARED_LIBS=true"
27+ ];
28+
29+ outputs = [ "out" "dev" ];
30+
31+ meta = with stdenv.lib; {
32+ license = licenses.mit;
33+ description = "A date and time library based on the C++11/14/17 <chrono> header";
34+ homepage = "https://github.com/HowardHinnant/date";
35+ platforms = platforms.linux;
36+ maintainers = with maintainers; [ ma27 ];
37+ };
38+}
pkgs/top-level/all-packages.nix+2
@@ -1562,6 +1562,8 @@ in
15621562
15631563 datasette = with python3Packages; toPythonApplication datasette;
15641564
1565+ howard-hinnant-date = callPackage ../development/libraries/howard-hinnant-date { };
1566+
15651567 datefudge = callPackage ../tools/system/datefudge { };
15661568
15671569 dateutils = callPackage ../tools/misc/dateutils { };