public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wlc: 1.3 -> 1.5

Browse Source 
use system-wide chck and wayland-protocols
enable tests
This commit is contained in:
Alexander Ried
2016-09-04 16:17:23 +02:00
committed by Franz Pletz
parent 73a4a917ec
commit 0d75166252
1 changed files with 11 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/wlc/default.nix
+11 -37
View File
@@ -5,51 +5,25 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wlc-${version}"; name = "wlc-${version}";
version = "v0.0.3"; version = "0.0.5";
chck_repo = "https://github.com/Cloudef/chck"; src = fetchgit {
chck_rev = "fe5e2606b7242aa5d89af2ea9fd048821128d2bc"; url = "https://github.com/Cloudef/wlc";
rev = "refs/tags/v${version}";
wl_protos_repo = "git://anongit.freedesktop.org/wayland/wayland-protocols"; sha256 = "0pg95n488fjlkc8n8x1h2dh4mxb7qln6mrq906lwwqv94aks9b43";
wl_protos_rev = "0b05b70f9da245582f01581be4ca36db683682b8"; fetchSubmodules = true;
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
'';
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ buildInputs = [
wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa libdrm udev wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa libdrm udev
libpthreadstubs libX11 libXau libXdmcp libXext libXdamage libxshmfence libXxf86vm libX11 libXdamage systemd dbus_libs
systemd dbus_libs
]; ];
makeFlags = "PREFIX=$(out) -lchck";
installPhase = "PREFIX=$out make install"; doCheck = true;
checkTarget = "test";
meta = { meta = {
description = "A library for making a simple Wayland compositor"; description = "A library for making a simple Wayland compositor";