updates

11 files changed, 115 insertions, 37 deletions

diff --git a/README.md b/README.md
index 800c4fe..b5d56ae 100644
--- a/README.md
+++ b/README.md
@@ -15,30 +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-06-03 03:54](https://github.com/nixos/nixpkgs-channels/commits/ae71c13a92f7e3b7968e8b7b1db9f6238dc00a25) |
+| nixpkgs/nixos-unstable | [2019-06-06 13:30](https://github.com/nixos/nixpkgs-channels/commits/1dc26c32edffdb73adb0a82b430834d3404aa8f3) |
 | nixpkgs/nixpkgs-unstable | [2019-05-29 03:19](https://github.com/nixos/nixpkgs-channels/commits/61f0936d1cd73760312712615233cd80195a9b47) |
-| pkgs/alacritty | [2019-06-03 20:01](https://github.com/jwilm/alacritty/commits/3931fb6fbce728c33b4ae2d1e604f181a7246fe0) |
+| pkgs/alacritty | [2019-06-07 22:09](https://github.com/jwilm/alacritty/commits/527dc8f564823d3dd01f79f22614271c7f3bc518) |
 | pkgs/cage | [2019-06-03 17:55](https://github.com/Hjdskes/cage/commits/1ecba7e67cfb8655d12b0b250b92eff71886bd4f) |
 | pkgs/gebaar-libinput | [2019-04-05 13:27](https://github.com/Coffee2CodeNL/gebaar-libinput/commits/c18c8bd73e79aaf1211bd88bf9cff808273cf6d6) |
 | pkgs/grim | [2019-06-04 20:00](https://github.com/emersion/grim/commits/e96ae285934aa6aae0ee4f97d35f516daf105afc) |
-| pkgs/i3status-rust | [2019-06-04 15:46](https://github.com/greshake/i3status-rust/commits/d1188a91030a1b03ebf890c00f0f5e8d52c050ac) |
-| pkgs/kanshi | [2019-06-03 04:55](https://github.com/emersion/kanshi/commits/725d7881b39591a772b8b6cbaf8bb3eab4566b17) |
+| pkgs/i3status-rust | [2019-06-05 22:34](https://github.com/greshake/i3status-rust/commits/c81c439943af8ed72dba33c4e25172d7abd99b84) |
+| pkgs/kanshi | [2019-06-07 20:15](https://github.com/emersion/kanshi/commits/76e9f4151f6d0880d32dbc57123e00eace1b0734) |
 | pkgs/mako | [2019-06-04 16:08](https://github.com/emersion/mako/commits/2970ef24f4c67db61874e70827bf616e7145d3e7) |
 | pkgs/oguri | [2019-05-26 22:46](https://github.com/vilhalmer/oguri/commits/f766b6d1f908e4b07765295892843cd8ceb7497a) |
 | pkgs/redshift-wayland | [2019-04-17 23:13](https://github.com/minus7/redshift/commits/eecbfedac48f827e96ad5e151de8f41f6cd3af66) |
 | pkgs/slurp | [2019-06-03 18:35](https://github.com/emersion/slurp/commits/0bd59daa7a3c701ec8f23bc5b4b77ea1df149a01) |
-| pkgs/sway | [2019-06-04 05:47](https://github.com/swaywm/sway/commits/799f5a2cd5ffa83d73816489aa8683564bc226f7) |
+| pkgs/sway | [2019-06-07 07:15](https://github.com/swaywm/sway/commits/9bfbb0dd49d4c473dfc5b3f89fb1469b416ea082) |
 | pkgs/swaybg | [2019-05-04 12:08](https://github.com/swaywm/swaybg/commits/25c6eaf15e64655385f01cbb98bffe28a862fe13) |
 | pkgs/swayidle | [2019-05-23 13:10](https://github.com/swaywm/swayidle/commits/5e7bd5bd21010cb5723acdf449edb341e9880ae2) |
-| pkgs/swaybg | [2019-05-04 12:08](https://github.com/swaywm/swaybg/commits/25c6eaf15e64655385f01cbb98bffe28a862fe13) |
 | pkgs/swaylock | [2019-05-23 06:43](https://github.com/swaywm/swaylock/commits/a9b274eb6c63397273515151324add022a3db2a9) |
-| pkgs/waybar | [2019-06-04 15:34](https://github.com/Alexays/waybar/commits/1962caf144ebd1d8772ffa0b77630ea48e61e615) |
+| pkgs/waybar | [2019-06-07 13:08](https://github.com/Alexays/waybar/commits/648eecdd8330af91ad31cfec199a0da5bd563766) |
 | pkgs/waybox | [2018-11-27 14:44](https://github.com/wizbright/waybox/commits/482d0a92f5530a5cbab8b0b913b653d4503015c4) |
 | pkgs/wayfire | [2019-05-22 12:55](https://github.com/WayfireWM/wayfire/commits/188dfd489ccb5e7889e998fded4070dafe922dda) |
 | pkgs/wf-config | [2019-05-10 12:27](https://github.com/WayfireWM/wf-config/commits/dd6f49522c7f6f4a303d9318cddf67ff38829b0a) |
 | pkgs/wf-recorder | [2019-05-22 13:40](https://github.com/ammen99/wf-recorder/commits/43fb1c25a80ac1e498b4e4db9c28ebd3def5804a) |
 | pkgs/wl-clipboard | [2019-04-15 15:53](https://github.com/bugaevc/wl-clipboard/commits/c010972e6b0d2eb3002c49a6a1b5620ff5f7c910) |
-| pkgs/wlroots | [2019-06-02 13:30](https://github.com/swaywm/wlroots/commits/3dec88e4555ee5fd95ffd69133623816cb0c25c4) |
+| pkgs/wlroots | [2019-06-07 13:06](https://github.com/swaywm/wlroots/commits/d201fc3506f70f5417b6dc00c8093c14db80b52a) |
 | pkgs/wtype | [2019-05-30 23:01](https://github.com/atx/wtype/commits/157ae8fb7bc4235d1dd87dde479eecfc2a17665f) |
 | pkgs/xdg-desktop-portal-wlr | [2019-02-12 12:09](https://github.com/emersion/xdg-desktop-portal-wlr/commits/74ee43cf37e716d0119f441be96e2b3fc9838797) |
 <!--pkgs-->
diff --git a/default.nix b/default.nix
index b0dbc91..51d151b 100644
--- a/default.nix
+++ b/default.nix
@@ -2,6 +2,7 @@ self: pkgs:
 let
 waylandPkgs = rec {
   # temp
+  wlroots_050     = pkgs.callPackage ./pkgs-temp/wlroots-0.5.0 {};
   wlroots_060     = pkgs.callPackage ./pkgs-temp/wlroots-0.6.0 {};
 
   # wlroots-related
@@ -23,14 +24,14 @@ waylandPkgs = rec {
     inherit (pkgs.python3Packages) python pygobject3 pyxdg wrapPython;
     geoclue = pkgs.geoclue2;
   };
-  waybox           = pkgs.callPackage ./pkgs/waybox { wlroots = pkgs.wlroots; };
+  waybox           = pkgs.callPackage ./pkgs/waybox { wlroots = wlroots_050; };
   wl-clipboard     = pkgs.callPackage ./pkgs/wl-clipboard {};
   wf-recorder      = pkgs.callPackage ./pkgs/wf-recorder {};
   gebaar-libinput  = pkgs.callPackage ./pkgs/gebaar-libinput {};
   i3status-rust    = pkgs.callPackage ./pkgs/i3status-rust {};
 
-  bspwc    = pkgs.callPackage ./pkgs/bspwc { wlroots = pkgs.wlroots; };
-  wltrunk  = pkgs.callPackage ./pkgs/wltrunk { wlroots = pkgs.wlroots; };
+  bspwc    = pkgs.callPackage ./pkgs/bspwc { wlroots = wlroots_050; };
+  wltrunk  = pkgs.callPackage ./pkgs/wltrunk { wlroots = wlroots_050; };
   glpaper  = pkgs.callPackage ./pkgs/glpaper {};
   waypipe  = pkgs.callPackage ./pkgs/waypipe {};
 
diff --git a/nixpkgs/nixos-unstable/metadata.nix b/nixpkgs/nixos-unstable/metadata.nix
index 3c7cbfd..90533b6 100644
--- a/nixpkgs/nixos-unstable/metadata.nix
+++ b/nixpkgs/nixos-unstable/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "ae71c13a92f7e3b7968e8b7b1db9f6238dc00a25";
-  sha256 = "0khm8khgyfhmnnmm7wjs5mh2cfvk124drflwswn9q341bkc4bqnw";
-  revdate = "2019-06-03T03:54:44Z";
+  rev = "1dc26c32edffdb73adb0a82b430834d3404aa8f3";
+  sha256 = "1m1sa3yagydhj74a044awkdifbk601i4n97gir3xywpgf8a9q5ph";
+  revdate = "2019-06-06T13:30:38Z";
 }
diff --git a/pkgs-temp/wlroots-0.5.0/default.nix b/pkgs-temp/wlroots-0.5.0/default.nix
new file mode 100644
index 0000000..d3b2d78
--- /dev/null
+++ b/pkgs-temp/wlroots-0.5.0/default.nix
@@ -0,0 +1,83 @@
+{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig
+, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman
+, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu
+, libpng, ffmpeg_4
+}:
+
+let
+  pname = "wlroots";
+  version = "0.5.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "swaywm";
+    repo = "wlroots";
+    rev = version;
+    sha256 = "1phiidyddzgaxy4gbqwmykxn0y8za6y5mp66l9dpd9i6fml153yq";
+  };
+
+  # $out for the library, $bin for rootston, and $examples for the example
+  # programs (in examples) AND rootston
+  outputs = [ "out" "bin" "examples" ];
+
+  nativeBuildInputs = [ meson ninja pkgconfig ];
+
+  buildInputs = [
+    wayland libGL wayland-protocols libinput libxkbcommon pixman
+    xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa_noglu
+    libpng ffmpeg_4
+  ];
+
+  mesonFlags = [
+    "-Dlibcap=enabled" "-Dlogind=enabled" "-Dxwayland=enabled" "-Dx11-backend=enabled"
+    "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled"
+  ];
+
+  postPatch = ''
+    # It happens from time to time that the version wasn't updated:
+    sed -iE "s/version: '[0-9]\.[0-9]\.[0-9]'/version: '${version}.0'/" meson.build
+  '';
+
+  postInstall = ''
+    # Copy the library to $bin and $examples
+    for output in "$bin" "$examples"; do
+      mkdir -p $output/lib
+      cp -P libwlroots* $output/lib/
+    done
+  '';
+
+  postFixup = ''
+    # Install rootston (the reference compositor) to $bin and $examples (this
+    # has to be done after the fixup phase to prevent broken binaries):
+    for output in "$bin" "$examples"; do
+      mkdir -p $output/bin
+      cp rootston/rootston $output/bin/
+      patchelf \
+        --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$output,g)" \
+        $output/bin/rootston
+      mkdir $output/etc
+      cp ../rootston/rootston.ini.example $output/etc/rootston.ini
+    done
+    # 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"
+      patchelf \
+        --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$examples,g)" \
+        "$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-temp/wlroots-0.6.0/metadata.nix b/pkgs-temp/wlroots-0.6.0/metadata.nix
deleted file mode 100644
index 2637cfa..0000000
--- a/pkgs-temp/wlroots-0.6.0/metadata.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  rev = "3dec88e4555ee5fd95ffd69133623816cb0c25c4";
-  sha256 = "1hcbxvy3a47gy4c1lg8avql79ddchgv8px11w4s3d6dl6pzfc5km";
-  revdate = "2019-06-02T13:30:47Z";
-}
diff --git a/pkgs/alacritty/metadata.nix b/pkgs/alacritty/metadata.nix
index 47240d6..83424d7 100644
--- a/pkgs/alacritty/metadata.nix
+++ b/pkgs/alacritty/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "3931fb6fbce728c33b4ae2d1e604f181a7246fe0";
-  sha256 = "0zf0il0v001h6kzyqc3nhxp983zmb9lj7434gql9zjzzi9y27zsi";
-  revdate = "2019-06-03T20:01:26Z";
+  rev = "527dc8f564823d3dd01f79f22614271c7f3bc518";
+  sha256 = "00xr36blz087zm5a1qb0s6z6c9wc8vvcnjd8ixspsd6hm73l8v0q";
+  revdate = "2019-06-07T22:09:22Z";
 }
diff --git a/pkgs/i3status-rust/metadata.nix b/pkgs/i3status-rust/metadata.nix
index 3057fe5..f1e0724 100644
--- a/pkgs/i3status-rust/metadata.nix
+++ b/pkgs/i3status-rust/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "d1188a91030a1b03ebf890c00f0f5e8d52c050ac";
-  sha256 = "00vcz7wlm5qn29xjq90s22rkrc2kw8g5ca8mgz3hxazgns4xgf55";
-  revdate = "2019-06-04T15:46:59Z";
+  rev = "c81c439943af8ed72dba33c4e25172d7abd99b84";
+  sha256 = "16cqps478z21yz5wzvc71ql612856ld2l4pm66hfa018xlgzrysd";
+  revdate = "2019-06-05T22:34:17Z";
 }
diff --git a/pkgs/kanshi/metadata.nix b/pkgs/kanshi/metadata.nix
index d4939b7..3c03961 100644
--- a/pkgs/kanshi/metadata.nix
+++ b/pkgs/kanshi/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "725d7881b39591a772b8b6cbaf8bb3eab4566b17";
-  sha256 = "09qmypm3yjvyv88hirvrq2sd50gv9af6dkla3xx8fb5ky1svqvl7";
-  revdate = "2019-06-03T04:55:45Z";
+  rev = "76e9f4151f6d0880d32dbc57123e00eace1b0734";
+  sha256 = "1bv2awp70wj1zxdlf6v5a5ajkwyxagrb7vp5lb4ka1m82ynvs99g";
+  revdate = "2019-06-07T20:15:40Z";
 }
diff --git a/pkgs/sway/metadata.nix b/pkgs/sway/metadata.nix
index b8f0ee4..fe5c7e5 100644
--- a/pkgs/sway/metadata.nix
+++ b/pkgs/sway/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "799f5a2cd5ffa83d73816489aa8683564bc226f7";
-  sha256 = "0kh5i5xbdpzay1vgwqgd027wb66jbx8cwqkdxx4ys2rr6hlmw2mv";
-  revdate = "2019-06-04T05:47:36Z";
+  rev = "9bfbb0dd49d4c473dfc5b3f89fb1469b416ea082";
+  sha256 = "16x0dw2rbf90zly2x3hrbgrwswcapjkfgj1kmnx61z8in2lad9jr";
+  revdate = "2019-06-07T07:15:03Z";
 }
diff --git a/pkgs/waybar/metadata.nix b/pkgs/waybar/metadata.nix
index 64e9bd0..ec7386f 100644
--- a/pkgs/waybar/metadata.nix
+++ b/pkgs/waybar/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "1962caf144ebd1d8772ffa0b77630ea48e61e615";
-  sha256 = "0f1vr0zscwvb5vlxbwrwijnx5aliw6sg11klj2wf27s37n6pdjmr";
-  revdate = "2019-06-04T15:34:00Z";
+  rev = "648eecdd8330af91ad31cfec199a0da5bd563766";
+  sha256 = "10ia12y5rpsqg6la9y9gnxx3a1b45j8j236fxl6bap0kh516p5ax";
+  revdate = "2019-06-07T13:08:33Z";
 }
diff --git a/pkgs/wlroots/metadata.nix b/pkgs/wlroots/metadata.nix
index 2637cfa..8e671e5 100644
--- a/pkgs/wlroots/metadata.nix
+++ b/pkgs/wlroots/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "3dec88e4555ee5fd95ffd69133623816cb0c25c4";
-  sha256 = "1hcbxvy3a47gy4c1lg8avql79ddchgv8px11w4s3d6dl6pzfc5km";
-  revdate = "2019-06-02T13:30:47Z";
+  rev = "d201fc3506f70f5417b6dc00c8093c14db80b52a";
+  sha256 = "15p8dy8lh56y083xavj4zygw6pbrd4x7j4kpyxlglcjaxiyb51i8";
+  revdate = "2019-06-07T13:06:11Z";
 }