Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

waybar: 0.9.0 -> 0.9.1, fix build #80417

Merged
merged 2 commits into from Feb 20, 2020
Merged

waybar: 0.9.0 -> 0.9.1, fix build #80417

merged 2 commits into from Feb 20, 2020

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Feb 18, 2020 •
edited

Motivation for this change

ZHF: #80379
https://hydra.nixos.org/build/113067187

Also supersedes #78458 as date is needed to build waybar-0.9.1.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Ma27 Ma27 added the 9.needs: port to stable A PR needs a backport to the stable release. label Feb 18, 2020
@Ma27 Ma27 mentioned this pull request Feb 18, 2020
Closed
10 tasks
@ofborg ofborg bot requested a review from Synthetica9 February 18, 2020 08:58
@erictapen
Copy link
Member

Following #78458 (comment), I'd prefer to name it howard-hinnant-date, as this seems to be the Repology meta name of the package?

Also could you, as you are already editing the package, add meta.homepage to Waybar?

Thanks for the fix and the upstream PRs!

@Synthetica9
Copy link
Member

Synthetica9 commented Feb 18, 2020 •
edited

Following #78458 (comment), I'd prefer to name it howard-hinnant-date, as this seems to be the Repology meta name of the package?

I agree, date seems too general for a package so specific

Ma27 and others added 2 commits February 18, 2020 13:40
@Ma27 @colemickens
date: init at 2020-01-24
9704297 
Needed for waybar-0.9.1.
Closes NixOS#78458

Co-authored-by: Cole Mickens <cole.mickens@gmail.com>
@Ma27
waybar: 0.9.0 -> 0.9.1, fix build
89e2a43 
ZHF: NixOS#80379
https://hydra.nixos.org/build/113067187
@Ma27
Copy link
Member Author

Ma27 commented Feb 18, 2020

@erictapen fixed :)

@eonpatapon
Copy link
Contributor

When building with pulseaudio support it fails:

../src/modules/network.cpp:68:3: error: 'assert' was not declared in this scope
   68 |   assert(starts_with(read, category));
      |   ^~~~~~
../src/modules/network.cpp:6:1: note: 'assert' is defined in header '<cassert>'; did you forget to '#include <cassert>'?
    5 | #include "util/format.hpp"
  +++ |+#include <cassert>
    6 |
[51/74] Compiling C++ object 'waybar@exe/src_modules_pulseaudio.cpp.o'.'.

It works when backporting this patch: Alexays/Waybar@129713f:

diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix
index 69d6ff84268..d302b3c58c2 100644
--- a/pkgs/applications/misc/waybar/default.nix
+++ b/pkgs/applications/misc/waybar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, wrapGAppsHook
+{ stdenv, fetchFromGitHub, fetchpatch, meson, pkgconfig, ninja, wrapGAppsHook
 , wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell
 , howard-hinnant-date, cmake
 , traySupport  ? true,  libdbusmenu-gtk3
@@ -46,6 +46,13 @@
       "-Dsystemd=disabled"
     ];

+    patches = [
+      (fetchpatch {
+        url = "https://github.com/Alexays/Waybar/commit/129713fe1b8986fb4722b8e439b16508f063b3e7.patch";
+        sha256 = "1zphcyh0097c5m2s6p93i674q5im4zm8bp0hqb607afsk6vi2qd8";
+      })
+    ];
+
     meta = with stdenv.lib; {
       description = "Highly customizable Wayland bar for Sway and Wlroots based compositors";
       license = licenses.mit;

@Ma27
Copy link
Member Author

Ma27 commented Feb 19, 2020 •
edited

What did you do to invoke the command? When running nix-build -E 'with import ./. {}; waybar.override { pulseSupport = true; }', it results in the following derivation:

/nix/store/4a7ss18bwgn6biiggvmybx25cb9dfwzk-waybar-0.9.1

EDIT: are you sure you're building waybar on the correct branch? The patch you linked appears to be in 0.9.1 (Alexays/Waybar@129713f).

@erictapen

This comment has been minimized.

Sign in to view
@eonpatapon
Copy link
Contributor

I'm sorry I had some override in my overlay that I forgot about :(

The build works fine

@Ma27 Ma27 merged commit 3c0b262 into NixOS:master Feb 20, 2020
@Ma27 Ma27 deleted the fix-waybar branch February 20, 2020 00:50
@Ma27
Copy link
Member Author

Ma27 commented Feb 20, 2020

Backported as 2fadc21, 590c89b.

@Ma27 Ma27 added 8.has: port to stable A PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels Feb 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz Awaiting requested review from fpletz

@colemickens colemickens Awaiting requested review from colemickens

@Synthetica9 Synthetica9 Awaiting requested review from Synthetica9

Assignees
No one assigned
Labels
8.has: package (new) 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Ma27 @erictapen @Synthetica9 @eonpatapon