wlc: Refactor the code

The code was a bit messy (unused parameters, etc.) and caused some
warnings/errors which could potentially cause some problems.
This commit is contained in:
Michael Weiss 2017-09-26 16:53:42 +02:00 committed by Michael Weiss
parent b4824605be
commit 4b85b23534

View File

@ -1,36 +1,37 @@
{ lib, stdenv, fetchgit, cmake, pkgconfig { stdenv, fetchFromGitHub, cmake, pkgconfig
, glibc, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa, libdrm, udev, systemd, dbus_libs , wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa
, libpthreadstubs, libX11, libXau, libXdmcp, libXext, libXdamage, libxshmfence, libXxf86vm , libdrm, udev, libX11, libXdamage, systemd, dbus_libs, wayland-protocols
, wayland-protocols , libpthreadstubs, libXau, libXdmcp, libXext, libXxf86vm
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wlc-${version}"; name = "wlc-${version}";
version = "0.0.9"; version = "0.0.9";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/Cloudef/wlc"; owner = "Cloudef";
rev = "refs/tags/v${version}"; repo = "wlc";
sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
}; sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg";
};
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
libX11 libXdamage systemd dbus_libs wayland-protocols libdrm udev libX11 libXdamage systemd dbus_libs wayland-protocols
libpthreadstubs libXau libXdmcp libXext libXxf86vm
]; ];
doCheck = true; doCheck = true;
checkTarget = "test"; checkTarget = "test";
meta = { meta = with stdenv.lib; {
description = "A library for making a simple Wayland compositor"; description = "A library for making a simple Wayland compositor";
homepage = https://github.com/Cloudef/wlc; inherit (src.meta) homepage;
license = lib.licenses.mit; license = licenses.mit;
platforms = lib.platforms.linux; platforms = platforms.linux;
maintainers = with lib.maintainers; [ ]; maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date.
}; };
} }