diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2019-12-29 14:04:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-29 14:04:14 +0100 |
commit | be1f5be9f3d9d1217397f743fb0f89438ae8bcd2 (patch) | |
tree | a028d4c927cde040de4ffe8f58928dbfcbad2cc2 | |
parent | f3cbe205fd85bb63d1fd9e2f86c687433acb7599 (diff) | |
parent | a84185860cd1653e74d033b03e84f904b1e16cd0 (diff) | |
download | nixlib-be1f5be9f3d9d1217397f743fb0f89438ae8bcd2.tar nixlib-be1f5be9f3d9d1217397f743fb0f89438ae8bcd2.tar.gz nixlib-be1f5be9f3d9d1217397f743fb0f89438ae8bcd2.tar.bz2 nixlib-be1f5be9f3d9d1217397f743fb0f89438ae8bcd2.tar.lz nixlib-be1f5be9f3d9d1217397f743fb0f89438ae8bcd2.tar.xz nixlib-be1f5be9f3d9d1217397f743fb0f89438ae8bcd2.tar.zst nixlib-be1f5be9f3d9d1217397f743fb0f89438ae8bcd2.zip |
Merge pull request #76609 from eonpatapon/waybar-0.9.0
Waybar 0.9.0
-rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/waybar/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/gtk-layer-shell/default.nix | 40 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 53 insertions, 4 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4952972eb4de..5337aa6d9120 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2123,6 +2123,12 @@ githubId = 10492681; name = "Michael Hoang"; }; + eonpatapon = { + email = "eon@patapon.info"; + github = "eonpatapon"; + githubId = 418227; + name = "Jean-Philippe Braun"; + }; eperuffo = { email = "info@emanueleperuffo.com"; github = "emanueleperuffo"; diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 002bdef7333e..84735feef21c 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, scdoc, spdlog +, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell , traySupport ? true, libdbusmenu-gtk3 , pulseSupport ? false, libpulseaudio , nlSupport ? true, libnl @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "0s8ck7qxka0l91ayma6amp9sc8cidi43byqgzcavi3a6id983r1z"; + sha256 = "1w8a6jih872ry288k8ic6mjfi9ccf1jwc24wnh9p5c7w73247c2c"; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ ]; buildInputs = with stdenv.lib; - [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog ] + [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog gtk-layer-shell ] ++ optional traySupport libdbusmenu-gtk3 ++ optional pulseSupport libpulseaudio ++ optional nlSupport libnl @@ -42,6 +42,7 @@ } ) ++ [ "-Dout=${placeholder "out"}" + "-Dsystemd=disabled" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix new file mode 100644 index 000000000000..c00e8035f18b --- /dev/null +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, pkgconfig +, wayland +, gtk3 +, gobject-introspection +}: + +stdenv.mkDerivation rec { + pname = "gtk-layer-shell"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "wmww"; + repo = "gtk-layer-shell"; + rev = "v${version}"; + sha256 = "1fwvlbwp5w1zly6mksvlzbx18ikq4bh7pdj9q0k94qlj6x2zdwg8"; + }; + + nativeBuildInputs = [ + meson ninja pkgconfig + ]; + + buildInputs = [ + wayland gtk3 gobject-introspection + ]; + + mesonFlags = [ + "-Dout=${placeholder "out"}" + ]; + + meta = with stdenv.lib; { + description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol"; + license = licenses.mit; + maintainers = with maintainers; [ eonpatapon ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcded82e5d97..18805dbf0628 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11780,6 +11780,8 @@ in gtkspellmm = callPackage ../development/libraries/gtkspellmm { }; + gtk-layer-shell = callPackage ../development/libraries/gtk-layer-shell { }; + gts = callPackage ../development/libraries/gts { }; gumbo = callPackage ../development/libraries/gumbo { }; |