bug#65279: closed ([PATCH] gnu: waybar: Update to 0.9.20.)

[GNU bug Tracking System]

Your message dated Tue, 29 Aug 2023 14:01:04 +0100
with message-id <87il8ygfw7.fsf@cbaines.net>
and subject line Re: [bug#65279] [PATCH] gnu: waybar: Update to 0.9.20.
has caused the debbugs.gnu.org bug report #65279,
regarding [PATCH] gnu: waybar: Update to 0.9.20.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
65279: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=65279
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: waybar: Update to 0.9.20.
>
>
>
>
> Date: 
>
> Mon, 14 Aug 2023 10:09:16 +0800
>
>
>
>
> * gnu/packages/wm.scm (waybar): Update to 0.9.20.
> [arguments]<:configure-flags>: Disable download missing dependencies.
> [inputs]: Add libevdev, pipewire and wireplumber.
> * gnu/packages/wm.scm (waybar-experimental)
> [arguments]<:configure-flags>: Disable download missing dependencies.
> ---
>  gnu/packages/wm.scm | 15 +++++++++++----
>  1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
> index ae571965e6..3709c7c7b8 100644
> --- a/gnu/packages/wm.scm
> +++ b/gnu/packages/wm.scm
> @@ -1894,7 +1894,7 @@ (define-public swaynotificationcenter
>  (define-public waybar
>    (package
>      (name "waybar")
> -    (version "0.9.18")
> +    (version "0.9.20")
>      (source
>       (origin
>         (method git-fetch)
> @@ -1903,22 +1903,27 @@ (define-public waybar
>               (commit version)))
>         (file-name (git-file-name name version))
>         (sha256
> -        (base32 "11yia2fs5a05jlbrdhxm26c2sgmbj3iwsk3bsqcvjvv3mlsrhxkf"))))
> +        (base32 "07h5l7h7wmzqgg7fbp98khrxg2sq2s4ncp4fiiz1yg62r752idy4"))))
>      (build-system meson-build-system)
> +    (arguments
> +     (list #:configure-flags #~(list "--wrap-mode=nodownload")))
>      (inputs (list date
>                    fmt
>                    gtk-layer-shell
>                    gtkmm-3
>                    jsoncpp
>                    libdbusmenu
> +                  libevdev
>                    libinput-minimal
>                    libmpdclient
>                    libnl
>                    libxml2
> +                  pipewire
>                    playerctl
>                    pulseaudio
>                    spdlog
> -                  wayland))
> +                  wayland
> +                  wireplumber))
>      (native-inputs
>       (list `(,glib "bin") pkg-config scdoc wayland-protocols))
>      (home-page "https://github.com/Alexays/Waybar";)
> @@ -1960,7 +1965,8 @@ (define-public waybar-experimental
>      (package/inherit base
>        (name "waybar-experimental")
>        (arguments
> -       (list #:configure-flags #~(list "-Dexperimental=true")))
> +       (list #:configure-flags #~(list "-Dexperimental=true"
> +                                       "--wrap-mode=nodownload")))
>        (synopsis "Waybar with experimental features"))))
>  
>  (define-public wlr-randr
> @@ -3437,3 +3443,4 @@ (define-public velox
>        (description "velox is a simple window manager for Wayland based on swc.
>  It is inspired by dwm and xmonad.")
>        (license license:expat))))
> +waybar
>
> base-commit: e7b8edc74490ebd345ca3b518418a59d1d00abe2
> -- 
> 2.41.0
>
>
>
>
> --- End Message ---

--- Begin Message --- Subject: Re: [bug#65279] [PATCH] gnu: waybar: Update to 0.9.20. Date: Tue, 29 Aug 2023 14:01:04 +0100 User-agent: mu4e 1.10.5; emacs 28.2

dan <i@dan.games> writes:

> * gnu/packages/wm.scm (waybar): Update to 0.9.20.
> [arguments]<:configure-flags>: Disable download missing dependencies.
> [inputs]: Add libevdev, pipewire and wireplumber.
> * gnu/packages/wm.scm (waybar-experimental)
> [arguments]<:configure-flags>: Disable download missing dependencies.
> ---
>  gnu/packages/wm.scm | 15 +++++++++++----
>  1 file changed, 11 insertions(+), 4 deletions(-)

...

> @@ -1960,7 +1965,8 @@ (define-public waybar-experimental
>      (package/inherit base
>        (name "waybar-experimental")
>        (arguments
> -       (list #:configure-flags #~(list "-Dexperimental=true")))
> +       (list #:configure-flags #~(list "-Dexperimental=true"
> +                                       "--wrap-mode=nodownload")))
>        (synopsis "Waybar with experimental features"))))

Here I've changed this to the following:

+       (substitute-keyword-arguments (package-arguments base)
+         ((#:configure-flags flags '())
+          #~(cons "-Dexperimental=true"
+                  #$flags))))

So now waybar-experimental will automatically inherit the configure
flags of waybar.

> @@ -3437,3 +3443,4 @@ (define-public velox
>        (description "velox is a simple window manager for Wayland based on 
> swc.
>  It is inspired by dwm and xmonad.")
>        (license license:expat))))
> +waybar

I've removed this line and pushed to master as
005da27028ebab8998ce54c88683d809b3ceaf62.

Thanks,

Chris

signature.asc
Description: PGP signature

--- End Message ---