wlc: 1.3 -> 1.5

use system-wide chck and wayland-protocols
enable tests
This commit is contained in:
Alexander Ried 2016-08-29 14:29:06 +02:00 committed by Franz Pletz
parent 73a4a917ec
commit 0d75166252
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4

View File

@ -5,51 +5,25 @@
stdenv.mkDerivation rec {
name = "wlc-${version}";
version = "v0.0.3";
version = "0.0.5";
chck_repo = "https://github.com/Cloudef/chck";
chck_rev = "fe5e2606b7242aa5d89af2ea9fd048821128d2bc";
wl_protos_repo = "git://anongit.freedesktop.org/wayland/wayland-protocols";
wl_protos_rev = "0b05b70f9da245582f01581be4ca36db683682b8";
wl_protos_rev_short = "0b05b70";
srcs = [
(fetchFromGitHub {
owner = "Cloudef";
repo = "wlc";
rev = version;
sha256 = "0l29axg4y7qjd5hf3kgf38hkjykb4mcsjkba0zdm583kkjzdzkb2";
})
(fetchurl {
url = "${chck_repo}/archive/${chck_rev}.tar.gz";
sha256 = "ca316b544c48e837c32f08d613be42da10e0a3251e8e4488d1848b91ef92ab9e";
})
(fetchgit {
url = "${wl_protos_repo}";
rev = "${wl_protos_rev}";
sha256 = "9c1cfbb570142b2109ecef4d11b17f25e94ed2e0569f522ea56f244c60465224";
})
];
sourceRoot = "wlc-${version}-src";
postUnpack = ''
rm -rf wlc-*/lib/chck ${sourceRoot}/protos/wayland-protocols
ln -s ../../chck-${chck_rev} ${sourceRoot}/lib/chck
ln -s ../../wayland-protocols-${wl_protos_rev_short} ${sourceRoot}/protos/wayland-protocols
'';
src = fetchgit {
url = "https://github.com/Cloudef/wlc";
rev = "refs/tags/v${version}";
sha256 = "0pg95n488fjlkc8n8x1h2dh4mxb7qln6mrq906lwwqv94aks9b43";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa libdrm udev
libpthreadstubs libX11 libXau libXdmcp libXext libXdamage libxshmfence libXxf86vm
systemd dbus_libs
libX11 libXdamage systemd dbus_libs
];
makeFlags = "PREFIX=$(out) -lchck";
installPhase = "PREFIX=$out make install";
doCheck = true;
checkTarget = "test";
meta = {
description = "A library for making a simple Wayland compositor";