updates

8 files changed, 22 insertions, 32 deletions

diff --git a/README.md b/README.md
index 27503e1..1b06d91 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Packages from this overlay are regularly updated and built against `nixos-unstab
 <!--pkgs-->
 | Attribute Name | Last Upstream Commit Time |
 | -------------- | ------------------------- |
-| nixpkgs/nixos-unstable | [2019-08-07 04:53](https://github.com/nixos/nixpkgs-channels/commits/e275a6c2f38d20a0bd9c5c113fb9d19b479a89fa) |
+| nixpkgs/nixos-unstable | [2019-08-08 20:29](https://github.com/nixos/nixpkgs-channels/commits/63fa75e34c12a296f2468e533407bca7c726b034) |
 | nixpkgs/nixpkgs-unstable | [2019-08-02 07:31](https://github.com/nixos/nixpkgs-channels/commits/002b853782e939c50da3fa7d424b08346f39eb6f) |
 | pkgs/cage | [2019-07-09 12:25](https://github.com/Hjdskes/cage/commits/016ef340d20febd15ae6d4fec2b6e9fba1422cee) |
 | pkgs/gebaar-libinput | [2019-04-05 13:27](https://github.com/Coffee2CodeNL/gebaar-libinput/commits/c18c8bd73e79aaf1211bd88bf9cff808273cf6d6) |
@@ -27,16 +27,17 @@ Packages from this overlay are regularly updated and built against `nixos-unstab
 | pkgs/redshift-wayland | [2019-04-17 23:13](https://github.com/minus7/redshift/commits/eecbfedac48f827e96ad5e151de8f41f6cd3af66) |
 | pkgs/slurp | [2019-08-01 17:25](https://github.com/emersion/slurp/commits/cdab5c9a42b27bb7e0e7894bbd2675637a06ad7e) |
 | pkgs/sway | [2019-08-07 07:25](https://github.com/swaywm/sway/commits/724926ea6ae119956dc7b1e39c2e30c1e3657676) |
-| pkgs/swaybg | [2019-05-04 12:08](https://github.com/swaywm/swaybg/commits/25c6eaf15e64655385f01cbb98bffe28a862fe13) |
+| pkgs/swaybg | [2019-08-08 23:03](https://github.com/swaywm/swaybg/commits/a8f109af90353369e7e2e689efe8ce06eb9c60ac) |
 | pkgs/swayidle | [2019-08-07 23:53](https://github.com/swaywm/swayidle/commits/91c0c4a943342ddc7fbed0777a654ac2b83185ca) |
 | pkgs/swaylock | [2019-08-04 06:15](https://github.com/swaywm/swaylock/commits/666ae950bc9c58b2676724e0d614f9018100fcca) |
-| pkgs/waybar | [2019-07-31 10:13](https://github.com/Alexays/waybar/commits/43beefb00d41d72f2d8ab549343e0415c08ac8b5) |
+| pkgs/waybar | [2019-08-08 10:25](https://github.com/Alexays/waybar/commits/e9b6380c1893d686992e0789d1dedc97f30ef779) |
 | pkgs/waybox | [2019-06-19 22:09](https://github.com/wizbright/waybox/commits/bed7b707f24613dae334de6e7bd8f4e3313fa249) |
 | pkgs/wayfire | [2019-08-03 14:43](https://github.com/WayfireWM/wayfire/commits/7f76400a469eecbe2bfff269e66bebe4d847c09c) |
 | pkgs/wf-config | [2019-06-18 19:10](https://github.com/WayfireWM/wf-config/commits/f9c97d07cf9e669a346c83a3c1fce3e2d843bd51) |
 | pkgs/wf-recorder | [2019-08-05 20:58](https://github.com/ammen99/wf-recorder/commits/20ab054b11d20c6d0da63917998af00c2f96d7c3) |
 | pkgs/wl-clipboard | [2019-04-15 15:53](https://github.com/bugaevc/wl-clipboard/commits/c010972e6b0d2eb3002c49a6a1b5620ff5f7c910) |
-| pkgs/wlroots | [2019-08-07 07:22](https://github.com/swaywm/wlroots/commits/01f903874b7e27539488fad7f31476d5bcbc6ac9) |
+| pkgs/wldash | [2019-08-08 22:12](https://github.com/kennylevinsen/wldash/commits/9c3bfb627eec90ea8553d599e00177d213207535) |
+| pkgs/wlroots | [2019-08-08 23:34](https://github.com/swaywm/wlroots/commits/58b2584863201f32d1a4770a1d5cde5e57b300c6) |
 | 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 71fd987..1fd0933 100644
--- a/default.nix
+++ b/default.nix
@@ -28,7 +28,7 @@ waylandPkgs = rec {
   i3status-rust    = pkgs.callPackage ./pkgs/i3status-rust {};
 
   #bspwc    = pkgs.callPackage ./pkgs/bspwc { wlroots = pkgs.wlroots; };
-  #wltrunk  = pkgs.callPackage ./pkgs/wltrunk { wlroots = pkgs.wlroots; };
+  wltrunk  = pkgs.callPackage ./pkgs/wltrunk { wlroots = pkgs.wlroots; };
   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 a14e951..838a54e 100644
--- a/nixpkgs/nixos-unstable/metadata.nix
+++ b/nixpkgs/nixos-unstable/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "e275a6c2f38d20a0bd9c5c113fb9d19b479a89fa";
-  sha256 = "1f3hx3vxpw72zpy8syadjaz2qsscckjs62qmk2m9sxmjr9470p4a";
-  revdate = "2019-08-07T04:53:34Z";
+  rev = "63fa75e34c12a296f2468e533407bca7c726b034";
+  sha256 = "0vkax58nfc19r165ax5hhmzvv9afrbsj2yx2s4xvlxhjdfcrcris";
+  revdate = "2019-08-08T20:29:22Z";
 }
diff --git a/pkgs/swaybg/metadata.nix b/pkgs/swaybg/metadata.nix
index 877a1e9..6de153f 100644
--- a/pkgs/swaybg/metadata.nix
+++ b/pkgs/swaybg/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "25c6eaf15e64655385f01cbb98bffe28a862fe13";
-  sha256 = "1j39al8dnjkbsm68h7c9nf7gm79gf798qqfaks7fq0cphal1gnr0";
-  revdate = "2019-05-04T12:08:26Z";
+  rev = "a8f109af90353369e7e2e689efe8ce06eb9c60ac";
+  sha256 = "0w0vyckh01mzr479jjqdc6dyj84gcc2k8q7x8v4b0d445za4hrar";
+  revdate = "2019-08-08T23:03:44Z";
 }
diff --git a/pkgs/waybar/metadata.nix b/pkgs/waybar/metadata.nix
index f506fdf..e4959ba 100644
--- a/pkgs/waybar/metadata.nix
+++ b/pkgs/waybar/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "43beefb00d41d72f2d8ab549343e0415c08ac8b5";
-  sha256 = "13cqdcgvk6baz58gn4x3rlvyk3smf9gmmh7s3jghxqkfj9icgcfl";
-  revdate = "2019-07-31T10:13:45Z";
+  rev = "e9b6380c1893d686992e0789d1dedc97f30ef779";
+  sha256 = "15biyr422s5f2csw395fz9cikir9wffdwqq8y0i6ayzpymzsqbzs";
+  revdate = "2019-08-08T10:25:31Z";
 }
diff --git a/pkgs/wlroots/default.nix b/pkgs/wlroots/default.nix
index fc01cdc..a5b72dd 100644
--- a/pkgs/wlroots/default.nix
+++ b/pkgs/wlroots/default.nix
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
 
   # $out for the library, $bin for rootston, and $examples for the example
   # programs (in examples) AND rootston
-  outputs = [ "out" "bin" "examples" ];
+  outputs = [ "out" "examples" ];
 
   nativeBuildInputs = [ meson ninja pkgconfig ];
 
@@ -39,22 +39,11 @@ in stdenv.mkDerivation rec {
   ];
 
   postInstall = ''
-    # Install rootston (the reference compositor) to $bin and $examples
-    for output in "$bin" "$examples"; do
-      mkdir -p $output/bin
-      cp rootston/rootston $output/bin/
-      mkdir $output/lib
-      cp libwlroots* $output/lib/
-      patchelf \
-        --set-rpath "$output/lib:${stdenv.lib.makeLibraryPath buildInputs}" \
-        $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
        patchelf \
diff --git a/pkgs/wlroots/metadata.nix b/pkgs/wlroots/metadata.nix
index abee671..411cf53 100644
--- a/pkgs/wlroots/metadata.nix
+++ b/pkgs/wlroots/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "01f903874b7e27539488fad7f31476d5bcbc6ac9";
-  sha256 = "1igrs4lk74ps4jzi76r1xpj91ms9izx3n5kgrv5kihjyzrlbz2a5";
-  revdate = "2019-08-07T07:22:11Z";
+  rev = "58b2584863201f32d1a4770a1d5cde5e57b300c6";
+  sha256 = "1i2jy7mygaqq7dh394v9acgb54nkm9lhq8ka7bd4yyqq5851b9sd";
+  revdate = "2019-08-08T23:34:59Z";
 }
diff --git a/pkgs/wltrunk/metadata.nix b/pkgs/wltrunk/metadata.nix
index de5981d..86c7efe 100644
--- a/pkgs/wltrunk/metadata.nix
+++ b/pkgs/wltrunk/metadata.nix
@@ -1,4 +1,4 @@
 {
-  rev = "0d6af745fb8604382498e50b73f4456fdd1f6ec3";
-  sha256 = "0cnpcq55lrhpjvi04a5j1dhchpqbw5kyiwqrywxa2icyii63nf8y";
+  rev = "a9a5feeba25f201c1912d2fe3c8031af440366a4";
+  sha256 = "0b48yrwml966z8xypi5m7kvxnxq3gg2zmp9gi5aid5p5nizba6sw";
 }