wlroots: 2017-10-31 -> 2017-12-22 + Init rootston
This commit is contained in:
parent
02a8c433dc
commit
bcfe03cc12
|
@ -1,30 +1,42 @@
|
||||||
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
|
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
|
||||||
, wayland, mesa_noglu, wayland-protocols, libinput, libxkbcommon, pixman
|
, wayland, mesa_noglu, wayland-protocols, libinput, libxkbcommon, pixman
|
||||||
, xcbutilwm, libX11, libcap
|
, xcbutilwm, libX11, libcap, xcbutilimage
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let pname = "wlroots";
|
let pname = "wlroots";
|
||||||
version = "unstable-2017-10-31";
|
version = "unstable-2017-12-22";
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "swaywm";
|
owner = "swaywm";
|
||||||
repo = "wlroots";
|
repo = "wlroots";
|
||||||
rev = "7200d643363e988edf6777c38e7f8fcd451a2c50";
|
rev = "0a370c529806077a11638e7fa856d5fbb539496b";
|
||||||
sha256 = "179raymkni1xzaph32zdhg7nfin0xfzrlnbnxkcr266k9y8k66ac";
|
sha256 = "0h3i0psn5595dncv53l5m2mf13k9wcv3qi16vla5ckpskykc0xx6";
|
||||||
};
|
};
|
||||||
|
|
||||||
# TODO: Temporary workaround for compilation errors
|
# 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 ];
|
nativeBuildInputs = [ meson ninja pkgconfig ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
wayland mesa_noglu wayland-protocols libinput libxkbcommon pixman
|
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; {
|
meta = with stdenv.lib; {
|
||||||
description = "A modular Wayland compositor library";
|
description = "A modular Wayland compositor library";
|
||||||
inherit (src.meta) homepage;
|
inherit (src.meta) homepage;
|
||||||
|
|
|
@ -15353,6 +15353,7 @@ with pkgs;
|
||||||
|
|
||||||
wlc = callPackage ../development/libraries/wlc { };
|
wlc = callPackage ../development/libraries/wlc { };
|
||||||
wlroots = callPackage ../development/libraries/wlroots { };
|
wlroots = callPackage ../development/libraries/wlroots { };
|
||||||
|
rootston = wlroots.bin;
|
||||||
orbment = callPackage ../applications/window-managers/orbment { };
|
orbment = callPackage ../applications/window-managers/orbment { };
|
||||||
sway = callPackage ../applications/window-managers/sway { };
|
sway = callPackage ../applications/window-managers/sway { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue