updates: rm wayfire, update most all other pkgs

Signed-off-by: Cole Mickens <cole.mickens@gmail.com>

16 files changed, 56 insertions, 49 deletions

diff --git a/README.md b/README.md
index 172d082..c8b6a84 100644
--- a/README.md
+++ b/README.md
@@ -15,26 +15,26 @@ Packages from this overlay are regularly updated and built against `nixos-unstab
 <!--pkgs-->
 | Attribute Name | Last Upstream Commit Time |
 | -------------- | ------------------------- |
-| nixpkgs/nixos-unstable | [2019-01-14 15:24](https://github.com/nixos/nixpkgs-channels/commits/be445a9074f139d63e704fa82610d25456562c3d) |
-| nixpkgs/nixpkgs-unstable | [2019-01-18 00:49](https://github.com/nixos/nixpkgs-channels/commits/8aba4ca411948d7c3e498f09a5191c0cff549425) |
-| pkgs/wlroots | [2019-01-18 13:52](https://github.com/swaywm/wlroots/commits/5dde2e794d076cd4ba8cb66849615dcc70f30ea4) |
-| pkgs/sway-beta | [2019-01-18 15:30](https://github.com/swaywm/sway/commits/1cce14e7c7ee78acacbe7210d177a96048a4e74b) |
-| pkgs/swayidle | [2019-01-18 12:55](https://github.com/swaywm/swayidle/commits/c94949dd75721faa9ea53f41e0326129c0449872) |
-| pkgs/swaylock | [2019-01-18 06:07](https://github.com/swaywm/swaylock/commits/52eeb9fc1e145a121fdbdaab56446ada26367903) |
+| nixpkgs/nixos-unstable | [2019-01-20 09:32](https://github.com/nixos/nixpkgs-channels/commits/bc41317e24317b0f506287f2d5bab00140b9b50e) |
+| nixpkgs/nixpkgs-unstable | [2019-01-21 21:50](https://github.com/nixos/nixpkgs-channels/commits/a5de41088031e6d3d4f799ef3964317a74e72169) |
+| pkgs/wlroots | [2019-01-22 11:13](https://github.com/swaywm/wlroots/commits/365a75139c382b3627ee96eade827038b1a2bc1a) |
+| pkgs/sway-beta | [2019-01-22 11:10](https://github.com/swaywm/sway/commits/9e6c6ce332a1d2b9e0387298e99bba824e0103a1) |
+| pkgs/swayidle | [2019-01-19 08:30](https://github.com/swaywm/swayidle/commits/72d15f8139705c1251aef7a7f7c64b8e527df206) |
+| pkgs/swaylock | [2019-01-22 06:11](https://github.com/swaywm/swaylock/commits/f0353900aed11f72f2f100cca1fcb60d34fc1c06) |
 | pkgs/slurp | [2019-01-09 15:24](https://github.com/emersion/slurp/commits/d9f3d741dc3de8c24198f41befc297e43054a523) |
 | pkgs/grim | [2019-01-11 14:45](https://github.com/emersion/grim/commits/b22b8a5ac3984c9b7d4ae5ba7ca112d3fd98b7a1) |
-| pkgs/mako | [2019-01-06 06:30](https://github.com/emersion/mako/commits/3211130215bc91db6d284f4ccffefd81ddd0f7e2) |
+| pkgs/mako | [2019-01-20 23:01](https://github.com/emersion/mako/commits/b30c786bdf8b90807e45ec0f52b292ee147ae1ff) |
 | pkgs/kanshi | [2019-01-09 09:05](https://github.com/emersion/kanshi/commits/c97715789db78a88970f6a4c86ecd9e59f156956) |
 | pkgs/wlstream | [2018-07-15 14:10](https://github.com/atomnuker/wlstream/commits/182076a94562b128c3a97ecc53cc68905ea86838) |
-| pkgs/oguri | [2018-12-27 09:16](https://github.com/vilhalmer/oguri/commits/bc82b841e0d9667b266378818b9e026308756f75) |
+| pkgs/oguri | [2019-01-19 14:57](https://github.com/vilhalmer/oguri/commits/88996939e8fb55c0a8d34596604660c87c585462) |
 | pkgs/waybar | [2019-01-14 00:05](https://github.com/Alexays/waybar/commits/aedf133b168ae780cb8688ef3e85abd143d79f3c) |
-| pkgs/wayfire | [2019-01-18 14:18](https://github.com/WayfireWM/wayfire/commits/d50be91a7f3a5c8ef270930855b7057e9dd21517) |
+| pkgs/wayfire | [2019-01-20 09:56](https://github.com/WayfireWM/wayfire/commits/f351b0766d27c3eb6b2b68f615bf7b6a1c193d2c) |
 | pkgs/wf-config | [2018-12-17 00:04](https://github.com/WayfireWM/wf-config/commits/6d3426e216ac62ffa035035f9c1bea074e184018) |
 | pkgs/redshift-wayland | [2018-11-07 12:03](https://github.com/minus7/redshift/commits/420d0d534c9f03abc4d634a7d3d7629caf29b4b6) |
 | pkgs/bspwc | [2018-12-29 15:21](https://github.com/Bl4ckb0ne/bspwc/commits/e72ff641bd30d3db153d879cea1cffd149931546) |
 | pkgs/waybox | [2018-11-27 06:44](https://github.com/wizbright/waybox/commits/482d0a92f5530a5cbab8b0b913b653d4503015c4) |
-| pkgs/wl-clipboard | [2019-01-13 03:21](https://github.com/bugaevc/wl-clipboard/commits/7a851c6690c99935d455572b121306a0decad48a) |
-| pkgs/wmfocus | [2019-01-08 03:15](https://github.com/svenstaro/wmfocus/commits/7cdbd7f6dabe2932828886ffad05a90df3555e3b) |
+| pkgs/wl-clipboard | [2019-01-22 06:11](https://github.com/bugaevc/wl-clipboard/commits/580043e42534b550a4846d56f14a973e78da57c3) |
+| pkgs/wmfocus | [2019-01-21 13:08](https://github.com/svenstaro/wmfocus/commits/69da8166d0cba19343d120e934c5088b8f8d0d43) |
 | pkgs/i3status-rust | [2018-12-24 09:01](https://github.com/greshake/i3status-rust/commits/31a595ee2b7ca84c3205560d96ec7bcf8ce02d0b) |
 <!--pkgs-->
 
diff --git a/default.nix b/default.nix
index 3dca42f..c395a56 100644
--- a/default.nix
+++ b/default.nix
@@ -3,7 +3,7 @@ let
 waylandPkgs = rec {
   # wlroots-related
   wlroots          = pkgs.callPackage ./pkgs/wlroots {};
-  wlroots-old      = pkgs.callPackage ./pkgs-temp/wlroots {};
+  #wlroots-old      = pkgs.callPackage ./pkgs-temp/wlroots {};
   sway-beta        = pkgs.callPackage ./pkgs/sway-beta {};
   swayidle         = pkgs.callPackage ./pkgs/swayidle {};
   swaylock         = pkgs.callPackage ./pkgs/swaylock {};
@@ -15,7 +15,7 @@ waylandPkgs = rec {
   oguri            = pkgs.callPackage ./pkgs/oguri {};
   waybar           = pkgs.callPackage ./pkgs/waybar {};
   wf-config        = pkgs.callPackage ./pkgs/wf-config {};
-  wayfire          = pkgs.callPackage ./pkgs/wayfire { wlroots = wlroots-old; };
+  #wayfire          = pkgs.callPackage ./pkgs/wayfire { wlroots = wlroots-old; };
   redshift-wayland = pkgs.callPackage ./pkgs/redshift-wayland {
     inherit (pkgs.python3Packages) python pygobject3 pyxdg wrapPython;
     geoclue = pkgs.geoclue2;
diff --git a/nixpkgs/nixos-unstable/metadata.nix b/nixpkgs/nixos-unstable/metadata.nix
index ee9b2b1..d3fc00d 100644
--- a/nixpkgs/nixos-unstable/metadata.nix
+++ b/nixpkgs/nixos-unstable/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "be445a9074f139d63e704fa82610d25456562c3d";
-  sha256 = "15dc7gdspimavcwyw9nif4s59v79gk18rwsafylffs9m1ld2dxwa";
-  revdate = "2019-01-14T23:24:12Z";
+  rev = "bc41317e24317b0f506287f2d5bab00140b9b50e";
+  sha256 = "1skl7icprfdq9wj1nivqyhylimgq7vy950h2m1lpbz2xjb3dk15k";
+  revdate = "2019-01-20T17:32:34Z";
 }
diff --git a/nixpkgs/nixpkgs-unstable/metadata.nix b/nixpkgs/nixpkgs-unstable/metadata.nix
index 86ecb87..53a83bb 100644
--- a/nixpkgs/nixpkgs-unstable/metadata.nix
+++ b/nixpkgs/nixpkgs-unstable/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "8aba4ca411948d7c3e498f09a5191c0cff549425";
-  sha256 = "11sn42bwcnqf72w6231zj2fg7ad4n25x45i3q5mzs91mxxnph45m";
-  revdate = "2019-01-18T08:49:50Z";
+  rev = "a5de41088031e6d3d4f799ef3964317a74e72169";
+  sha256 = "0ycsai65dbcwmns36a0pkxpsgpl86q273c27ag80nijfb1w88201";
+  revdate = "2019-01-22T05:50:23Z";
 }
diff --git a/pkgs/mako/metadata.nix b/pkgs/mako/metadata.nix
index 8c1c90b..9ce99fa 100644
--- a/pkgs/mako/metadata.nix
+++ b/pkgs/mako/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "3211130215bc91db6d284f4ccffefd81ddd0f7e2";
-  sha256 = "1fyc4996dmabbq5k86rssm9lsxrrq5w6wj819cxbsxxc5z95pgn0";
-  revdate = "2019-01-06T14:30:23Z";
+  rev = "b30c786bdf8b90807e45ec0f52b292ee147ae1ff";
+  sha256 = "1dw75cdvn34kmwdgzm228zvm0apd10rw1hx1k9xbmhihzf7jg76y";
+  revdate = "2019-01-21T07:01:30Z";
 }
diff --git a/pkgs/oguri/metadata.nix b/pkgs/oguri/metadata.nix
index 05da558..ca17c6a 100644
--- a/pkgs/oguri/metadata.nix
+++ b/pkgs/oguri/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "bc82b841e0d9667b266378818b9e026308756f75";
-  sha256 = "177lywv2kxq9kbpkr225hxllnabb8pp13ihdvsxb1i0wjcl1ingr";
-  revdate = "2018-12-27T17:16:33Z";
+  rev = "88996939e8fb55c0a8d34596604660c87c585462";
+  sha256 = "0070gp76nmfpa2p79sazah59n5105p8mjr2q6k6p4h6d53qq56j0";
+  revdate = "2019-01-19T22:57:31Z";
 }
diff --git a/pkgs/sway-beta/default.nix b/pkgs/sway-beta/default.nix
index fd7e4bc..379756f 100644
--- a/pkgs/sway-beta/default.nix
+++ b/pkgs/sway-beta/default.nix
@@ -34,7 +34,13 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  mesonFlags = "-Dsway-version=${version}";
+  mesonFlags = [
+    "-Dsway-version=${version}"
+    "-Dxwayland=enabled"
+    "-Dtray=enabled"
+    "-Dgdk-pixbuf=enabled"
+    "-Dman-pages=enabled"
+  ];
 
   meta = with stdenv.lib; {
     description = "i3-compatible window manager for Wayland";
diff --git a/pkgs/sway-beta/metadata.nix b/pkgs/sway-beta/metadata.nix
index 899c367..1be0348 100644
--- a/pkgs/sway-beta/metadata.nix
+++ b/pkgs/sway-beta/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "1cce14e7c7ee78acacbe7210d177a96048a4e74b";
-  sha256 = "142k7fj134wappw45cpr6rkzr8skpj47ba520a88nl57j7z0k1lx";
-  revdate = "2019-01-18T23:30:13Z";
+  rev = "9e6c6ce332a1d2b9e0387298e99bba824e0103a1";
+  sha256 = "1zm1g6lv8f2g55c0ybbnp7czgq0x1lvghwm3yz73i9rxvwv22bzd";
+  revdate = "2019-01-22T19:10:19Z";
 }
diff --git a/pkgs/swayidle/metadata.nix b/pkgs/swayidle/metadata.nix
index c9d3106..6ec02ca 100644
--- a/pkgs/swayidle/metadata.nix
+++ b/pkgs/swayidle/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "c94949dd75721faa9ea53f41e0326129c0449872";
-  sha256 = "1kx8miwlkbx3kj6ndcc0n8zdcn6yn3z97iz0xbi52ajmzrvjbqmm";
-  revdate = "2019-01-18T20:55:52Z";
+  rev = "72d15f8139705c1251aef7a7f7c64b8e527df206";
+  sha256 = "0bqmzs7vzni1gnsfp882zlv8cj939w2fpgy6fyb9zsl2fmmgi4ch";
+  revdate = "2019-01-19T16:30:58Z";
 }
diff --git a/pkgs/swaylock/metadata.nix b/pkgs/swaylock/metadata.nix
index 28b3033..facf8d1 100644
--- a/pkgs/swaylock/metadata.nix
+++ b/pkgs/swaylock/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "52eeb9fc1e145a121fdbdaab56446ada26367903";
-  sha256 = "0201r2vfi5hx4lapgghqp4gxycrpsr78c9ybw8gzmlccs72fmnac";
-  revdate = "2019-01-18T14:07:17Z";
+  rev = "f0353900aed11f72f2f100cca1fcb60d34fc1c06";
+  sha256 = "1igvkp3ga5y79n7rh293s3i86fm12i1hyjpl9ml2nclqwz04kwcg";
+  revdate = "2019-01-22T14:11:36Z";
 }
diff --git a/pkgs/wayfire/default.nix b/pkgs/wayfire/default.nix
index d3c7c71..10f39bd 100644
--- a/pkgs/wayfire/default.nix
+++ b/pkgs/wayfire/default.nix
@@ -6,8 +6,8 @@
 , pixman, libxkbcommon, libdrm
 , wlroots, wf-config
 , libjpeg, libpng
+, libGL
 , buildDocs ? true
-#, egl, glesv2
 }:
 
 let
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
     pixman libxkbcommon libdrm
     wlroots wf-config
     libjpeg libpng
+    libGL
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/wayfire/metadata.nix b/pkgs/wayfire/metadata.nix
index d34da1d..8986b5c 100644
--- a/pkgs/wayfire/metadata.nix
+++ b/pkgs/wayfire/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "d50be91a7f3a5c8ef270930855b7057e9dd21517";
-  sha256 = "0805ayk8yagla7x43z247z64bvxrvrvl52b8y23nkbpyi0ha9hrx";
-  revdate = "2019-01-18T22:18:22Z";
+  rev = "f351b0766d27c3eb6b2b68f615bf7b6a1c193d2c";
+  sha256 = "1hrq4zv8lc3szwcg5vpkv1i08ia4cp8nhi4si1gfxsjrnlgj8ii1";
+  revdate = "2019-01-20T17:56:49Z";
 }
diff --git a/pkgs/wl-clipboard/metadata.nix b/pkgs/wl-clipboard/metadata.nix
index 6ca4a73..bc97812 100644
--- a/pkgs/wl-clipboard/metadata.nix
+++ b/pkgs/wl-clipboard/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "7a851c6690c99935d455572b121306a0decad48a";
-  sha256 = "173p9c6a04bvnvrxpjjm70wi891lh10wnxm2v28m5yf807420bwl";
-  revdate = "2019-01-13T11:21:14Z";
+  rev = "580043e42534b550a4846d56f14a973e78da57c3";
+  sha256 = "0dsh5a529lywr30z32rlrxlny0hg1pxjyp4a03c2l1nai7xx76vk";
+  revdate = "2019-01-22T14:11:44Z";
 }
diff --git a/pkgs/wlroots/metadata.nix b/pkgs/wlroots/metadata.nix
index 4582958..50996c9 100644
--- a/pkgs/wlroots/metadata.nix
+++ b/pkgs/wlroots/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "5dde2e794d076cd4ba8cb66849615dcc70f30ea4";
-  sha256 = "0567ypizh27r1sidx608fg9gh2ar8v1kgnflfik3lvl36qaxhzm6";
-  revdate = "2019-01-18T21:52:38Z";
+  rev = "365a75139c382b3627ee96eade827038b1a2bc1a";
+  sha256 = "1blhmgcf9i1ba1nr35myvn2078q22683fp2zrl5m1xp9w4bidf0y";
+  revdate = "2019-01-22T19:13:01Z";
 }
diff --git a/pkgs/wmfocus/default.nix b/pkgs/wmfocus/default.nix
index 133496c..fdcb4b7 100644
--- a/pkgs/wmfocus/default.nix
+++ b/pkgs/wmfocus/default.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage {
     sha256 = hash;
   };
 
-  cargoSha256 = "01ifrk6whvckys1kbj65cdwh976yn7dy9vpf4jybnlqripknab43";
+  cargoSha256 = "1zn2f8cyzd53g4d4qb7pgwgfw8nrvmcszzcfmndzxv21gdizqy3v";
 
   meta = with stdenv.lib; {
     description = ''
diff --git a/pkgs/wmfocus/metadata.nix b/pkgs/wmfocus/metadata.nix
index 555e25d..dd8f3c8 100644
--- a/pkgs/wmfocus/metadata.nix
+++ b/pkgs/wmfocus/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "7cdbd7f6dabe2932828886ffad05a90df3555e3b";
-  sha256 = "0jx0h2zyghs3bp4sg8f3vk5rkyprz2dqfqs0v72vmkp3cvgzxbvs";
-  revdate = "2019-01-08T11:15:20Z";
+  rev = "69da8166d0cba19343d120e934c5088b8f8d0d43";
+  sha256 = "1s3ws68dhp002dcgb79q988yrzrf9hrd81299zy25b8r8f2czc6w";
+  revdate = "2019-01-21T21:08:48Z";
 }