From 9a6c6c1ec3a8c1f088363c9609f0ce6f9b7b181a Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Fri, 9 Aug 2019 03:04:34 +0200
Subject: updates

---
 pkgs/wlroots/default.nix  | 15 ++-------------
 pkgs/wlroots/metadata.nix |  6 +++---
 2 files changed, 5 insertions(+), 16 deletions(-)

(limited to 'pkgs/wlroots')

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";
 }
-- 
cgit v1.2.3