Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 007e94cdb3bd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1c9b39ef7150
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 26, 2019

  1. waybar: 0.4.0 -> 0.5.0

    @minijackson
    minijackson committed Mar 26, 2019
    Copy the full SHA
    e3dadb1 View commit details

  2. Merge pull request #58378 from minijackson/waybar-0.5.0 

    waybar: 0.4.0 -> 0.5.0
    @dywedir
    dywedir authored Mar 26, 2019
    Copy the full SHA
    1c9b39e View commit details
Showing with 6 additions and 3 deletions.
  1. +6 −3 pkgs/applications/misc/waybar/default.nix
9 changes: 6 additions & 3 deletions pkgs/applications/misc/waybar/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,17 +3,18 @@
, traySupport ? true, libdbusmenu-gtk3
, pulseSupport ? false, libpulseaudio
, nlSupport ? true, libnl
, udevSupport ? true, udev
, swaySupport ? true, sway
}:
stdenv.mkDerivation rec {
name = "waybar-${version}";
version = "0.4.0";
version = "0.5.0";

src = fetchFromGitHub {
owner = "Alexays";
repo = "Waybar";
rev = version;
sha256 = "0vkx1b6bgr75wkx89ppxhg4103vl2g0sky22npmfkvbkpgh8dj38";
sha256 = "006pzx4crsqn9vk28g87306xh3jrfwk4ib9cmsxqrxy8v0kl2s4g";
};

nativeBuildInputs = [
@@ -25,19 +26,21 @@
++ optional traySupport libdbusmenu-gtk3
++ optional pulseSupport libpulseaudio
++ optional nlSupport libnl
++ optional udevSupport udev
++ optional swaySupport sway;

mesonFlags = [
"-Ddbusmenu-gtk=${ if traySupport then "enabled" else "disabled" }"
"-Dpulseaudio=${ if pulseSupport then "enabled" else "disabled" }"
"-Dlibnl=${ if nlSupport then "enabled" else "disabled" }"
"-Dlibudev=${ if udevSupport then "enabled" else "disabled" }"
"-Dout=${placeholder "out"}"
];

meta = with stdenv.lib; {
description = "Highly customizable Wayland bar for Sway and Wlroots based compositors";
license = licenses.mit;
maintainers = [ maintainers.FlorianFranzen ];
maintainers = with maintainers; [ FlorianFranzen minijackson ];
platforms = platforms.unix;
};
}