updates

17 files changed, 54 insertions, 47 deletions

diff --git a/README.md b/README.md
index 76a70c8..c8d13ba 100644
--- a/README.md
+++ b/README.md
@@ -15,29 +15,29 @@ Packages from this overlay are regularly updated and built against `nixos-unstab
 <!--pkgs-->
 | Attribute Name | Last Upstream Commit Time |
 | -------------- | ------------------------- |
-| nixpkgs/nixos-unstable | [2019-04-04 17:44](https://github.com/nixos/nixpkgs-channels/commits/acbdaa569f4ee387386ebe1b9e60b9f95b4ab21b) |
-| nixpkgs/nixpkgs-unstable | [2019-04-06 09:03](https://github.com/nixos/nixpkgs-channels/commits/0c0954781e257b8b0dc49341795a2fe7d96945a3) |
-| pkgs/wlroots | [2019-04-14 16:35](https://github.com/swaywm/wlroots/commits/dc5d1d08ef60a603790d823de021fcd986434c60) |
+| nixpkgs/nixos-unstable | [2019-04-25 07:41](https://github.com/nixos/nixpkgs-channels/commits/dfd8f84aef129f1978e446b5d45ef05cd4421821) |
+| nixpkgs/nixpkgs-unstable | [2019-04-25 06:56](https://github.com/nixos/nixpkgs-channels/commits/ed1b59a98e7bd61dd7eac266569c294fb6b16300) |
+| pkgs/wlroots | [2019-04-28 21:00](https://github.com/swaywm/wlroots/commits/22dd7d3731634fc8e719768c8154a6e65f9e8f84) |
 | pkgs/xdg-desktop-portal-wlr | [2019-02-12 12:09](https://github.com/emersion/xdg-desktop-portal-wlr/commits/74ee43cf37e716d0119f441be96e2b3fc9838797) |
-| pkgs/sway | [2019-04-15 00:44](https://github.com/swaywm/sway/commits/b2cfcebef61087f819b55d2f815e62aa4a6f1a52) |
+| pkgs/sway | [2019-04-28 18:07](https://github.com/swaywm/sway/commits/3b3e0560beb9a44f038736fd4c344052fdfe3f81) |
 | pkgs/swayidle | [2019-02-16 16:43](https://github.com/swaywm/swayidle/commits/3e392e31c0684854a9a145cda1bd9a44c99ef24d) |
-| pkgs/swaylock | [2019-04-03 05:15](https://github.com/swaywm/swaylock/commits/98e5afe364776d06017579e14f972be6f65fbb8b) |
+| pkgs/swaylock | [2019-04-22 22:14](https://github.com/swaywm/swaylock/commits/f403cc07021d75f54752584ead2f53f5dc50b673) |
 | pkgs/slurp | [2019-03-16 19:52](https://github.com/emersion/slurp/commits/92dc1ea1cf79541d157e98af3fb6aa4df501fef4) |
 | pkgs/grim | [2019-02-20 13:18](https://github.com/emersion/grim/commits/6994df611f55a4089209fdd5ad8d9301e4fb0167) |
-| pkgs/mako | [2019-04-14 17:01](https://github.com/emersion/mako/commits/76ad8aee1bd3b69c44b79be9e795559083c44c54) |
+| pkgs/mako | [2019-04-28 08:29](https://github.com/emersion/mako/commits/9a3b0f338907df4ac4e0e81e947343270fc0df31) |
 | pkgs/kanshi | [2019-02-02 23:21](https://github.com/emersion/kanshi/commits/970267e400c21a6bb51a1c80a0aadfd1e6660a7b) |
 | pkgs/wlstream | [2018-07-15 21:10](https://github.com/atomnuker/wlstream/commits/182076a94562b128c3a97ecc53cc68905ea86838) |
 | pkgs/oguri | [2019-02-19 14:19](https://github.com/vilhalmer/oguri/commits/59a51758f4b14f60113aad6ae4ebb92d80060ce5) |
-| pkgs/waybar | [2019-04-15 10:10](https://github.com/Alexays/waybar/commits/3273ee8b426e156e0834566c823cd36f8a1c8f25) |
-| pkgs/wayfire | [2019-03-29 09:21](https://github.com/WayfireWM/wayfire/commits/eefc5479db94f391c4260e320a79cdfe513f329f) |
+| pkgs/waybar | [2019-04-26 19:57](https://github.com/Alexays/waybar/commits/e8f31a0c4f659f9ab36eae048b4ef927c6013db3) |
+| pkgs/wayfire | [2019-04-21 07:40](https://github.com/WayfireWM/wayfire/commits/910d745cf2dd043a5a3436e98a5a00ba76642420) |
 | pkgs/wf-config | [2019-03-24 21:20](https://github.com/WayfireWM/wf-config/commits/a0504d822160c5fc69d3af9cf853e2cc2e5ce3e4) |
-| pkgs/redshift-wayland | [2018-11-07 20:03](https://github.com/minus7/redshift/commits/420d0d534c9f03abc4d634a7d3d7629caf29b4b6) |
+| pkgs/redshift-wayland | [2019-04-17 23:13](https://github.com/minus7/redshift/commits/eecbfedac48f827e96ad5e151de8f41f6cd3af66) |
 | pkgs/bspwc | [2018-12-29 23:21](https://github.com/Bl4ckb0ne/bspwc/commits/e72ff641bd30d3db153d879cea1cffd149931546) |
 | pkgs/waybox | [2018-11-27 14:44](https://github.com/wizbright/waybox/commits/482d0a92f5530a5cbab8b0b913b653d4503015c4) |
 | pkgs/wl-clipboard | [2019-04-15 15:53](https://github.com/bugaevc/wl-clipboard/commits/c010972e6b0d2eb3002c49a6a1b5620ff5f7c910) |
-| pkgs/wf-recorder | [2019-03-31 16:41](https://github.com/ammen99/wf-recorder/commits/bfae5d959c1d19d2d1cffbf1da7b70c4d05a64e6) |
+| pkgs/wf-recorder | [2019-04-21 13:25](https://github.com/ammen99/wf-recorder/commits/ddb96690556371007e316577ed1b14f0cb62e13c) |
 | pkgs/gebaar-libinput | [2019-04-05 13:27](https://github.com/Coffee2CodeNL/gebaar-libinput/commits/c18c8bd73e79aaf1211bd88bf9cff808273cf6d6) |
-| pkgs/i3status-rust | [2019-04-10 19:31](https://github.com/greshake/i3status-rust/commits/559d231caa574ddc665a7828fdef546e0429351b) |
+| pkgs/i3status-rust | [2019-04-27 18:59](https://github.com/greshake/i3status-rust/commits/d04d08cbd4d13c64b1e3b7a8d21c46acee3bc281) |
 <!--pkgs-->
 
 </details>
diff --git a/default.nix b/default.nix
index 5daec84..e498560 100644
--- a/default.nix
+++ b/default.nix
@@ -24,8 +24,8 @@ waylandPkgs = rec {
     inherit (pkgs.python3Packages) python pygobject3 pyxdg wrapPython;
     geoclue = pkgs.geoclue2;
   };
-  bspwc            = pkgs.callPackage ./pkgs/bspwc {};
-  waybox           = pkgs.callPackage ./pkgs/waybox {};
+  bspwc            = pkgs.callPackage ./pkgs/bspwc { wlroots = pkgs.wlroots; };
+  waybox           = pkgs.callPackage ./pkgs/waybox { wlroots = pkgs.wlroots; };
   wl-clipboard     = pkgs.callPackage ./pkgs/wl-clipboard {};
   wf-recorder      = pkgs.callPackage ./pkgs/wf-recorder {};
 
diff --git a/nixpkgs/nixos-unstable/metadata.nix b/nixpkgs/nixos-unstable/metadata.nix
index 729ddb8..b90c874 100644
--- a/nixpkgs/nixos-unstable/metadata.nix
+++ b/nixpkgs/nixos-unstable/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "acbdaa569f4ee387386ebe1b9e60b9f95b4ab21b";
-  sha256 = "0xzyghyxk3hwhicgdbi8yv8b8ijy1rgdsj5wb26y5j322v96zlpz";
-  revdate = "2019-04-04T17:44:54Z";
+  rev = "dfd8f84aef129f1978e446b5d45ef05cd4421821";
+  sha256 = "0av0q7xyv76jq2csbg10x8gcnlnadlppvlx616s7qz7jahkmymrl";
+  revdate = "2019-04-25T07:41:52Z";
 }
diff --git a/nixpkgs/nixpkgs-unstable/metadata.nix b/nixpkgs/nixpkgs-unstable/metadata.nix
index 2f11d19..de91b36 100644
--- a/nixpkgs/nixpkgs-unstable/metadata.nix
+++ b/nixpkgs/nixpkgs-unstable/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "0c0954781e257b8b0dc49341795a2fe7d96945a3";
-  sha256 = "05fq11wg8mik4zvfjy2gap59r8n0gfbklsw61r45wlqi7a2zsl0y";
-  revdate = "2019-04-06T09:03:29Z";
+  rev = "ed1b59a98e7bd61dd7eac266569c294fb6b16300";
+  sha256 = "0b2wdbbaqdqccl7q9gskhfjk7xaqvjwcls4b6218anyc247gscnb";
+  revdate = "2019-04-25T06:56:55Z";
 }
diff --git a/pkgs/i3status-rust/default.nix b/pkgs/i3status-rust/default.nix
index 4f4b3df..6fc3339 100644
--- a/pkgs/i3status-rust/default.nix
+++ b/pkgs/i3status-rust/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = metadata.sha256;
   };
 
-  cargoSha256 = "06izzv86nkn1izapldysyryz9zvjxvq23c742z284bnxjfq5my6i";
+  cargoSha256 = "0vl2zn9n7ijmjxi2lyglnghvaw4qi2bah5i6km15schlsm8c641g";
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/i3status-rust/metadata.nix b/pkgs/i3status-rust/metadata.nix
index 2c4fdd4..cc21ef2 100644
--- a/pkgs/i3status-rust/metadata.nix
+++ b/pkgs/i3status-rust/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "559d231caa574ddc665a7828fdef546e0429351b";
-  sha256 = "1c2ijn8lgpbp2byshvdz92dmihvylkbl2kvchg02difimxmp6rv7";
-  revdate = "2019-04-10T19:31:40Z";
+  rev = "d04d08cbd4d13c64b1e3b7a8d21c46acee3bc281";
+  sha256 = "0x23qv7kwsqy1yx25fn1z56fx8w865qarr5xdx8s22x42ym4zyha";
+  revdate = "2019-04-27T18:59:31Z";
 }
diff --git a/pkgs/mako/metadata.nix b/pkgs/mako/metadata.nix
index 555b130..012684f 100644
--- a/pkgs/mako/metadata.nix
+++ b/pkgs/mako/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "76ad8aee1bd3b69c44b79be9e795559083c44c54";
-  sha256 = "14k6yaf23b8355l89rxfj1avyp5ablinb2zyjgnjyxbj7nmdvy8h";
-  revdate = "2019-04-14T17:01:30Z";
+  rev = "9a3b0f338907df4ac4e0e81e947343270fc0df31";
+  sha256 = "1d8abz3zh7jpxh8xzibwmznvsqs39czc7cxikyn2p3vc3mdz3gd8";
+  revdate = "2019-04-28T08:29:51Z";
 }
diff --git a/pkgs/redshift-wayland/metadata.nix b/pkgs/redshift-wayland/metadata.nix
index a0d2a2b..670b141 100644
--- a/pkgs/redshift-wayland/metadata.nix
+++ b/pkgs/redshift-wayland/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "420d0d534c9f03abc4d634a7d3d7629caf29b4b6";
-  sha256 = "12dwb96i4pbny5s64k6k4f8k936xa41zvcjhv54wv0ax471ymls7";
-  revdate = "2018-11-07T20:03:51Z";
+  rev = "eecbfedac48f827e96ad5e151de8f41f6cd3af66";
+  sha256 = "0rs9bxxrw4wscf4a8yl776a8g880m5gcm75q06yx2cn3lw2b7v22";
+  revdate = "2019-04-17T23:13:58Z";
 }
diff --git a/pkgs/sway/default.nix b/pkgs/sway/default.nix
index 5560a43..491c862 100644
--- a/pkgs/sway/default.nix
+++ b/pkgs/sway/default.nix
@@ -2,6 +2,7 @@
 , meson, ninja
 , pkgconfig, scdoc
 , wayland, libxkbcommon, pcre, json_c, dbus, libevdev
+, libglvnd
 , pango, cairo, libinput, libcap, pam, gdk_pixbuf
 , wlroots, wayland-protocols
 }:
@@ -30,6 +31,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     wayland libxkbcommon pcre json_c dbus libevdev
     pango cairo libinput libcap pam gdk_pixbuf
+    libglvnd
     wlroots wayland-protocols
   ];
 
diff --git a/pkgs/sway/metadata.nix b/pkgs/sway/metadata.nix
index 598bc46..0765097 100644
--- a/pkgs/sway/metadata.nix
+++ b/pkgs/sway/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "b2cfcebef61087f819b55d2f815e62aa4a6f1a52";
-  sha256 = "1pgyxjq4wkblhfh8c6vd1vhyhwp8nb0z98hf9isfjlylqni9ihqp";
-  revdate = "2019-04-15T00:44:12Z";
+  rev = "3b3e0560beb9a44f038736fd4c344052fdfe3f81";
+  sha256 = "15l4gck4wsps884x0vbx6hlwxfxx857gha99w0pvdk0b84yfxap5";
+  revdate = "2019-04-28T18:07:47Z";
 }
diff --git a/pkgs/swaylock/metadata.nix b/pkgs/swaylock/metadata.nix
index 1083be2..1b05a71 100644
--- a/pkgs/swaylock/metadata.nix
+++ b/pkgs/swaylock/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "98e5afe364776d06017579e14f972be6f65fbb8b";
-  sha256 = "1jh0ha7n1zkfnwqkbiyjafhbcyj3ghqhz8qxx6ayhxnkhr47iq4m";
-  revdate = "2019-04-03T05:15:51Z";
+  rev = "f403cc07021d75f54752584ead2f53f5dc50b673";
+  sha256 = "0wmk700nl0csk3bdmvn7vy2xxys986aq15ga7g80jw72cspyqg3z";
+  revdate = "2019-04-22T22:14:09Z";
 }
diff --git a/pkgs/waybar/default.nix b/pkgs/waybar/default.nix
index 5d05cdf..666f72a 100644
--- a/pkgs/waybar/default.nix
+++ b/pkgs/waybar/default.nix
@@ -5,6 +5,7 @@
 , fmt, jsoncpp, libdbusmenu-gtk3
 , glib
 , git
+, mpd_clientlib
 }:
 
 let
@@ -27,6 +28,7 @@ stdenv.mkDerivation rec {
     libpulseaudio libinput libnl gtkmm3
     git fmt jsoncpp libdbusmenu-gtk3
     glib
+    mpd_clientlib
   ];
   mesonFlags = [
     "-Dauto_features=enabled"
diff --git a/pkgs/waybar/metadata.nix b/pkgs/waybar/metadata.nix
index f683f15..56fa307 100644
--- a/pkgs/waybar/metadata.nix
+++ b/pkgs/waybar/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "3273ee8b426e156e0834566c823cd36f8a1c8f25";
-  sha256 = "0k2hzl2j030kz6rdyk895c30kxs9m4cb4p4gmwixfync2rx8ixsp";
-  revdate = "2019-04-15T10:10:37Z";
+  rev = "e8f31a0c4f659f9ab36eae048b4ef927c6013db3";
+  sha256 = "1wlh6lhlbyi5ril3barg6856zpizabr0lmsg5hd4s04g5kghssyb";
+  revdate = "2019-04-26T19:57:15Z";
 }
diff --git a/pkgs/wayfire/metadata.nix b/pkgs/wayfire/metadata.nix
index 10160d4..3f1d87b 100644
--- a/pkgs/wayfire/metadata.nix
+++ b/pkgs/wayfire/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "eefc5479db94f391c4260e320a79cdfe513f329f";
-  sha256 = "0x9ai8jrqq5lwccwasa2krskql9jm1j47yqvy9wbb60x4y8salny";
-  revdate = "2019-03-29T09:21:43Z";
+  rev = "910d745cf2dd043a5a3436e98a5a00ba76642420";
+  sha256 = "1pscldd8pip7g0vyw69abz8b816a40acncvy5aiqgr5z40cbvi3j";
+  revdate = "2019-04-21T07:40:39Z";
 }
diff --git a/pkgs/wf-recorder/metadata.nix b/pkgs/wf-recorder/metadata.nix
index 067b273..04bae16 100644
--- a/pkgs/wf-recorder/metadata.nix
+++ b/pkgs/wf-recorder/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "bfae5d959c1d19d2d1cffbf1da7b70c4d05a64e6";
-  sha256 = "1s4bw2fpqvs71g00ddjs1m04vzv30n75ix7nz0lkm505iw91ph1c";
-  revdate = "2019-03-31T16:41:30Z";
+  rev = "ddb96690556371007e316577ed1b14f0cb62e13c";
+  sha256 = "04amfd1kyklcj6nmmmf21dz333ykglvhxb3cbzak06v2fxlrp2w3";
+  revdate = "2019-04-21T13:25:23Z";
 }
diff --git a/pkgs/wlroots/default.nix b/pkgs/wlroots/default.nix
index 4bd5b65..fc01cdc 100644
--- a/pkgs/wlroots/default.nix
+++ b/pkgs/wlroots/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig
 , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman
 , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu
+, freerdp
 , libpng, ffmpeg_4
 }:
 
@@ -28,11 +29,13 @@ in stdenv.mkDerivation rec {
     wayland libGL wayland-protocols libinput libxkbcommon pixman
     xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa_noglu
     libpng ffmpeg_4
+    freerdp
   ];
 
   mesonFlags = [
     "-Dlibcap=enabled" "-Dlogind=enabled" "-Dxwayland=enabled" "-Dx11-backend=enabled"
     "-Dxcb-icccm=enabled" "-Dxcb-xkb=enabled" "-Dxcb-errors=enabled"
+    "-Dfreerdp=enabled"
   ];
 
   postInstall = ''
diff --git a/pkgs/wlroots/metadata.nix b/pkgs/wlroots/metadata.nix
index 4b3bc42..b7f46b8 100644
--- a/pkgs/wlroots/metadata.nix
+++ b/pkgs/wlroots/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "dc5d1d08ef60a603790d823de021fcd986434c60";
-  sha256 = "1cnzwwcjg0xc4ncbz2ixqy8n6djnh4pa1n3nlv013awpy0d547g3";
-  revdate = "2019-04-14T16:35:23Z";
+  rev = "22dd7d3731634fc8e719768c8154a6e65f9e8f84";
+  sha256 = "07l1farc5hnw47pr1a9j2zyvi4xchakrp5hjyfgrh7mrakcigw89";
+  revdate = "2019-04-28T21:00:53Z";
 }