diff options
author | Michael Weiss <root@tracer.primeos.eu> | 2017-09-26 16:53:42 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2017-09-26 16:56:09 +0200 |
commit | 4b85b235348698460f6b0f90b312c6c097d247a7 (patch) | |
tree | ef701ff5194d78ac1a27040bc44e082066942412 /pkgs | |
parent | b4824605be8c2a470c5e190f7b590142ab0fe058 (diff) | |
download | nixlib-4b85b235348698460f6b0f90b312c6c097d247a7.tar nixlib-4b85b235348698460f6b0f90b312c6c097d247a7.tar.gz nixlib-4b85b235348698460f6b0f90b312c6c097d247a7.tar.bz2 nixlib-4b85b235348698460f6b0f90b312c6c097d247a7.tar.lz nixlib-4b85b235348698460f6b0f90b312c6c097d247a7.tar.xz nixlib-4b85b235348698460f6b0f90b312c6c097d247a7.tar.zst nixlib-4b85b235348698460f6b0f90b312c6c097d247a7.zip |
wlc: Refactor the code
The code was a bit messy (unused parameters, etc.) and caused some warnings/errors which could potentially cause some problems.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/wlc/default.nix | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 832600fed874..2c0f8c784183 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,36 +1,37 @@ -{ lib, stdenv, fetchgit, cmake, pkgconfig -, glibc, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa, libdrm, udev, systemd, dbus_libs -, libpthreadstubs, libX11, libXau, libXdmcp, libXext, libXdamage, libxshmfence, libXxf86vm -, wayland-protocols +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa +, libdrm, udev, libX11, libXdamage, systemd, dbus_libs, wayland-protocols +, libpthreadstubs, libXau, libXdmcp, libXext, libXxf86vm }: stdenv.mkDerivation rec { name = "wlc-${version}"; version = "0.0.9"; - src = fetchgit { - url = "https://github.com/Cloudef/wlc"; - rev = "refs/tags/v${version}"; - sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg"; + src = fetchFromGitHub { + owner = "Cloudef"; + repo = "wlc"; + rev = "v${version}"; fetchSubmodules = true; - }; + sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg"; + }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa libdrm udev - libX11 libXdamage systemd dbus_libs wayland-protocols + wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa + libdrm udev libX11 libXdamage systemd dbus_libs wayland-protocols + libpthreadstubs libXau libXdmcp libXext libXxf86vm ]; - doCheck = true; checkTarget = "test"; - meta = { + meta = with stdenv.lib; { description = "A library for making a simple Wayland compositor"; - homepage = https://github.com/Cloudef/wlc; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + inherit (src.meta) homepage; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date. }; } |