wlroots: 2017-10-31 -> 2017-12-22 + Init rootston

NixOS · Dec 23, 2017 · bcfe03c · bcfe03c
1 parent 02a8c43
commit bcfe03c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
@@ -1,30 +1,42 @@
 { stdenv, fetchFromGitHub, meson, ninja, pkgconfig
 , wayland, mesa_noglu, wayland-protocols, libinput, libxkbcommon, pixman
-, xcbutilwm, libX11, libcap
+, xcbutilwm, libX11, libcap, xcbutilimage
 }:
 
 let pname = "wlroots";
-    version = "unstable-2017-10-31";
+    version = "unstable-2017-12-22";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "wlroots";
-    rev = "7200d643363e988edf6777c38e7f8fcd451a2c50";
-    sha256 = "179raymkni1xzaph32zdhg7nfin0xfzrlnbnxkcr266k9y8k66ac";
+    rev = "0a370c529806077a11638e7fa856d5fbb539496b";
+    sha256 = "0h3i0psn5595dncv53l5m2mf13k9wcv3qi16vla5ckpskykc0xx6";
   };
 
   # TODO: Temporary workaround for compilation errors
-  patches = [ ./libdrm.patch ./no-werror.patch ];
+  patches = [ ./libdrm.patch ]; #./no-werror.patch
+
+  # $out for the library and $bin for rootston
+  outputs = [ "out" "bin" ];
 
   nativeBuildInputs = [ meson ninja pkgconfig ];
 
   buildInputs = [
     wayland mesa_noglu wayland-protocols libinput libxkbcommon pixman
-    xcbutilwm libX11 libcap
+    xcbutilwm libX11 libcap xcbutilimage
   ];
 
+  # Install rootston (the reference compositor) to $bin
+  postInstall = ''
+    mkdir -p $bin/bin
+    cp rootston/rootston $bin/bin/
+    mkdir $bin/lib
+    cp libwlroots.so $bin/lib/
+    patchelf --set-rpath "$bin/lib:${stdenv.lib.makeLibraryPath buildInputs}" $bin/bin/rootston
+  '';
+
   meta = with stdenv.lib; {
     description = "A modular Wayland compositor library";
     inherit (src.meta) homepage;

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -15353,6 +15353,7 @@ with pkgs;
 
   wlc = callPackage ../development/libraries/wlc { };
   wlroots = callPackage ../development/libraries/wlroots { };
+  rootston = wlroots.bin;
   orbment = callPackage ../applications/window-managers/orbment { };
   sway = callPackage ../applications/window-managers/sway { };