updates

10 files changed, 89 insertions, 29 deletions

diff --git a/README.md b/README.md
index d87a6b9..c6c5435 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,8 @@ Packages from this overlay are regularly updated and built against `nixos-unstab
 <!--pkgs-->
 | Attribute Name | Last Upstream Commit Time |
 | -------------- | ------------------------- |
-| nixpkgs/nixos-unstable | [2019-10-11 12:20](https://github.com/nixos/nixpkgs-channels/commits/b943338ea582aeb9b0a406d7fb75f3f62bc16a9d) |
-| nixpkgs/nixpkgs-unstable | [2019-10-13 08:21](https://github.com/nixos/nixpkgs-channels/commits/7818f30cc4b6b282ecd361a5e62d1c99ec8c0c78) |
+| nixpkgs/nixos-unstable | [2019-10-20 17:12](https://github.com/nixos/nixpkgs-channels/commits/f35f0880f2cdbc8c1bc81492811251f120d7a9bc) |
+| nixpkgs/nixpkgs-unstable | [2019-10-21 01:51](https://github.com/nixos/nixpkgs-channels/commits/91d5b3f07d27622ff620ff31fa5edce15a5822fa) |
 | pkgs/cage | [2019-08-27 16:14](https://github.com/Hjdskes/cage/commits/0fb513fb85eb5846eb598b91a0fc79dc16b5da36) |
 | pkgs/gebaar-libinput | [2019-04-05 13:27](https://github.com/Coffee2CodeNL/gebaar-libinput/commits/c18c8bd73e79aaf1211bd88bf9cff808273cf6d6) |
 | pkgs/grim | [2019-07-20 16:11](https://github.com/emersion/grim/commits/a9af6088d5e6eb31c4c12a659b4641e9398e33e9) |
@@ -26,19 +26,19 @@ Packages from this overlay are regularly updated and built against `nixos-unstab
 | pkgs/oguri | [2019-09-03 02:54](https://github.com/vilhalmer/oguri/commits/5372ee49bb22b0370100be8589f3692da58602e3) |
 | pkgs/redshift-wayland | [2019-08-24 15:20](https://github.com/minus7/redshift/commits/7da875d34854a6a34612d5ce4bd8718c32bec804) |
 | pkgs/slurp | [2019-08-01 17:25](https://github.com/emersion/slurp/commits/cdab5c9a42b27bb7e0e7894bbd2675637a06ad7e) |
-| pkgs/sway | [2019-10-12 19:58](https://github.com/swaywm/sway/commits/533acbe679b2eb1abfcac31aa6bfadd5cffe265d) |
+| pkgs/sway | [2019-10-23 07:53](https://github.com/swaywm/sway/commits/06fcebc542a919ab3ab73fad67088ec454713aaa) |
 | pkgs/swaybg | [2019-08-08 23:03](https://github.com/swaywm/swaybg/commits/a8f109af90353369e7e2e689efe8ce06eb9c60ac) |
 | pkgs/swayidle | [2019-08-27 15:18](https://github.com/swaywm/swayidle/commits/844dfde8538c1f55aaf254c18649d419bdff7a92) |
 | pkgs/swaylock | [2019-09-12 20:33](https://github.com/swaywm/swaylock/commits/426e1ce93d1344414bd3fa0eb7cd50d7ca9ec075) |
-| pkgs/waybar | [2019-10-07 07:23](https://github.com/Alexays/waybar/commits/5e4fdb15304f04132612c3a0c5724ae8ce099201) |
+| pkgs/waybar | [2019-10-19 15:19](https://github.com/Alexays/waybar/commits/7f7ebb5367751c9c6eb82226c9168cf6e809d16c) |
 | pkgs/waybox | [2019-06-19 22:09](https://github.com/wizbright/waybox/commits/bed7b707f24613dae334de6e7bd8f4e3313fa249) |
-| pkgs/wayfire | [2019-10-12 09:11](https://github.com/WayfireWM/wayfire/commits/da81825a4c98b5461d2f7459c7a3277b2f13abe2) |
+| pkgs/wayfire | [2019-10-14 20:34](https://github.com/WayfireWM/wayfire/commits/13fe9735ac2c0b278eb55df3ec96e4844266305b) |
 | pkgs/wf-config | [2019-10-07 21:06](https://github.com/WayfireWM/wf-config/commits/c32580e04d0ebc93dbd439f77a2158b96cdc8dce) |
-| pkgs/wf-recorder | [2019-10-04 19:18](https://github.com/ammen99/wf-recorder/commits/69fbe1b68274600f799cdbb16fe5948465d9a0da) |
+| pkgs/wf-recorder | [2019-10-22 10:16](https://github.com/ammen99/wf-recorder/commits/7cb37c47e30b477f97bebb027748f8f7ab92478f) |
 | pkgs/wl-clipboard | [2019-10-03 12:16](https://github.com/bugaevc/wl-clipboard/commits/f3a45f69f7d14e7f7050bca4cbf6fea6697d1455) |
 | pkgs/wdisplays | [2019-10-05 01:27](https://github.com/cyclopsian/wdisplays/commits/a3d3d13a017d4a5b461311d6d477e94b36f29990) |
 | pkgs/wldash | [2019-10-05 20:43](https://github.com/kennylevinsen/wldash/commits/9233128b7c90537cb2157139a7ed1a3d0fbdfd8e) |
-| pkgs/wlroots | [2019-10-11 20:43](https://github.com/swaywm/wlroots/commits/480a31ea4e1a3aadbd053ee2a581cad5d4356876) |
+| pkgs/wlroots | [2019-10-23 09:36](https://github.com/swaywm/wlroots/commits/e97c2c3639119831ced4f6b9f704b096c2075973) |
 | pkgs/wtype | [2019-07-01 15:33](https://github.com/atx/wtype/commits/9752f420ffb1dd8b9cbc692d9f90cbe2cca343d9) |
 | pkgs/xdg-desktop-portal-wlr | [2019-07-24 16:38](https://github.com/emersion/xdg-desktop-portal-wlr/commits/13076d0c10613e9ae73e61dd82b24ae9a6529667) |
 <!--pkgs-->
diff --git a/default.nix b/default.nix
index 2c782be..09b4f8b 100644
--- a/default.nix
+++ b/default.nix
@@ -3,6 +3,7 @@ let
 waylandPkgs = rec {
   # wlroots-related
   wlroots          = pkgs.callPackage ./pkgs/wlroots {};
+  wlroots-wf       = pkgs.callPackage ./pkgs-temp/wlroots {};
   xdg-desktop-portal-wlr = pkgs.callPackage ./pkgs/xdg-desktop-portal-wlr {};
   sway             = pkgs.callPackage ./pkgs/sway {};
   swaybg           = pkgs.callPackage ./pkgs/swaybg {};
@@ -15,7 +16,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 {};
+  wayfire          = pkgs.callPackage ./pkgs/wayfire { wlroots = wlroots-wf; };
   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 96fadd9..4a5206d 100644
--- a/nixpkgs/nixos-unstable/metadata.nix
+++ b/nixpkgs/nixos-unstable/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "b943338ea582aeb9b0a406d7fb75f3f62bc16a9d";
-  sha256 = "06azqwqg1x4xyr9cw75d465rbwla9cjjynjvd8r4bls5zgvvkcjy";
-  revdate = "2019-10-11T12:20:27Z";
+  rev = "f35f0880f2cdbc8c1bc81492811251f120d7a9bc";
+  sha256 = "16ggjvcp2q5pfwxdrnma1b4bc05y4p3j5gxhb7f8gjbal1ndfk91";
+  revdate = "2019-10-20T17:12:45Z";
 }
diff --git a/nixpkgs/nixpkgs-unstable/metadata.nix b/nixpkgs/nixpkgs-unstable/metadata.nix
index 6baeeed..a0296ea 100644
--- a/nixpkgs/nixpkgs-unstable/metadata.nix
+++ b/nixpkgs/nixpkgs-unstable/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "7818f30cc4b6b282ecd361a5e62d1c99ec8c0c78";
-  sha256 = "13dvckd0c8q2739p4nygh9v8b2h57796kq7jwpi4bqx6h6hibi84";
-  revdate = "2019-10-13T08:21:49Z";
+  rev = "91d5b3f07d27622ff620ff31fa5edce15a5822fa";
+  sha256 = "09vlhjbkjivv9aiklhwq9wpzn954pcyp3fhrwslm28ip4iar9b55";
+  revdate = "2019-10-21T01:51:24Z";
 }
diff --git a/pkgs-temp/wlroots/default.nix b/pkgs-temp/wlroots/default.nix
new file mode 100644
index 0000000..26c548f
--- /dev/null
+++ b/pkgs-temp/wlroots/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
+, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman
+, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
+, libpng, ffmpeg_4, freerdp
+}:
+
+stdenv.mkDerivation rec {
+  pname = "wlroots";
+  version = "6bb7639a0f35317cc8f29034577710c2387ebcd1";
+
+  src = fetchFromGitHub {
+    owner = "swaywm";
+    repo = "wlroots";
+    rev = version;
+    sha256 = "1dx5ghfcvl4d3mjnhm36x9zgsamlv9llq884560p4a65ygydlx02";
+  };
+
+  # $out for the library and $examples for the example programs (in examples):
+  outputs = [ "out" "examples" ];
+
+  nativeBuildInputs = [ meson ninja pkgconfig ];
+
+  buildInputs = [
+    wayland libGL wayland-protocols libinput libxkbcommon pixman
+    xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
+    libpng ffmpeg_4 freerdp
+  ];
+
+  mesonFlags = [
+    "-Dlibcap=enabled" "-Dlogind=enabled" "-Dxwayland=enabled" "-Dx11-backend=enabled"
+    "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled"
+  ];
+
+  postInstall = ''
+    # Copy the library to $examples
+    mkdir -p $examples/lib
+    cp -P libwlroots* $examples/lib/
+  '';
+
+  postFixup = ''
+    # Install ALL example programs to $examples:
+    # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle
+    # screenshot output-layout multi-pointer rotation tablet touch pointer
+    # simple
+    mkdir -p $examples/bin
+    cd ./examples
+    for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do
+      cp "$binary" "$examples/bin/wlroots-$binary"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A modular Wayland compositor library";
+    inherit (src.meta) homepage;
+    license     = licenses.mit;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ primeos ];
+  };
+}
diff --git a/pkgs/sway/metadata.nix b/pkgs/sway/metadata.nix
index 3f6b0ef..090a284 100644
--- a/pkgs/sway/metadata.nix
+++ b/pkgs/sway/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "533acbe679b2eb1abfcac31aa6bfadd5cffe265d";
-  sha256 = "1bhzzzapf15z8b2h8cz6a0vzx8xl1jqaqv8b4mhm2h42vkah3zrx";
-  revdate = "2019-10-12T19:58:05Z";
+  rev = "06fcebc542a919ab3ab73fad67088ec454713aaa";
+  sha256 = "1dk8i57g68bhb02cmz2vf9srq0hcr662ksp2ij774fzzhjqs2gvq";
+  revdate = "2019-10-23T07:53:16Z";
 }
diff --git a/pkgs/waybar/metadata.nix b/pkgs/waybar/metadata.nix
index 36cdf2c..9442d75 100644
--- a/pkgs/waybar/metadata.nix
+++ b/pkgs/waybar/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "5e4fdb15304f04132612c3a0c5724ae8ce099201";
-  sha256 = "1bbfcgbma2g8yz16yn2l13b9kgpvgc5lz7a8d0sny7smn2kls5zc";
-  revdate = "2019-10-07T07:23:00Z";
+  rev = "7f7ebb5367751c9c6eb82226c9168cf6e809d16c";
+  sha256 = "0rm3n8466x6s9jgsjb1xnks9lz3v9a9d7s7l1rxabxmw619cpk1l";
+  revdate = "2019-10-19T15:19:35Z";
 }
diff --git a/pkgs/wayfire/metadata.nix b/pkgs/wayfire/metadata.nix
index fc3df03..fd6b2b5 100644
--- a/pkgs/wayfire/metadata.nix
+++ b/pkgs/wayfire/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "da81825a4c98b5461d2f7459c7a3277b2f13abe2";
-  sha256 = "1wvgnnnyc0w6bjp68qn2ym2i83vawjvd8i3hx2nw7dqz9is755x4";
-  revdate = "2019-10-12T09:11:42Z";
+  rev = "13fe9735ac2c0b278eb55df3ec96e4844266305b";
+  sha256 = "11k2b05nrckqhiq54b7qkg8kb3wg8lpcxgwdb9l03xrww2v3xnvi";
+  revdate = "2019-10-14T20:34:31Z";
 }
diff --git a/pkgs/wf-recorder/metadata.nix b/pkgs/wf-recorder/metadata.nix
index e837f54..3a81b14 100644
--- a/pkgs/wf-recorder/metadata.nix
+++ b/pkgs/wf-recorder/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "69fbe1b68274600f799cdbb16fe5948465d9a0da";
-  sha256 = "0jk5zb1pyfawhf0g9ki411zjvk0xp4dzri76na4xfi7k1jxks1a4";
-  revdate = "2019-10-04T19:18:16Z";
+  rev = "7cb37c47e30b477f97bebb027748f8f7ab92478f";
+  sha256 = "1ijlq2nw2lhgxgzi5pxls69mylvs0dzpmykb0rcm93zbmbxy4aav";
+  revdate = "2019-10-22T10:16:00Z";
 }
diff --git a/pkgs/wlroots/metadata.nix b/pkgs/wlroots/metadata.nix
index a2706aa..ef5bf67 100644
--- a/pkgs/wlroots/metadata.nix
+++ b/pkgs/wlroots/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "480a31ea4e1a3aadbd053ee2a581cad5d4356876";
-  sha256 = "1kvwi9yhb9r66bv6rygpxrpyh79ljg1zimk2qd36dk3mq96p8fz4";
-  revdate = "2019-10-11T20:43:13Z";
+  rev = "e97c2c3639119831ced4f6b9f704b096c2075973";
+  sha256 = "000f96pf9n8mmq11gj8yhbc56z80g79ccla2and5wk8gg47nblix";
+  revdate = "2019-10-23T09:36:50Z";
 }