diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2017-12-23 14:02:59 +0100 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2017-12-23 14:02:59 +0100 |
commit | bcfe03cc120ce431efd0c041b5df0205e15d99ba (patch) | |
tree | fa0a784f0ff3e01abee86645222be203abb9e9aa /pkgs/development/libraries/wlroots | |
parent | 02a8c433dc24b73e7ccad3e09dbdebe178adcf3e (diff) |
wlroots: 2017-10-31 -> 2017-12-22 + Init rootston
Diffstat (limited to 'pkgs/development/libraries/wlroots')
-rw-r--r-- | pkgs/development/libraries/wlroots/default.nix | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 79bd8bb96659..8db3c466522c 100644 --- 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; |