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

wlroots: 2017-12-22 -> 2018-03-16

Browse Source
This commit is contained in:
Michael Weiss 2018-03-17 15:06:49 +01:00
parent 5693c5da8e
commit f9134b08c2
3 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/wlroots/default.nix
View File

@ -1,23 +1,20 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig { stdenv, fetchFromGitHub, meson, ninja, pkgconfig
, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman
, xcbutilwm, libX11, libcap, xcbutilimage , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors
}: }:
let pname = "wlroots"; let pname = "wlroots";
version = "unstable-2017-12-22"; version = "unstable-2018-03-16";
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 = "0a370c529806077a11638e7fa856d5fbb539496b"; rev = "9cc875429b40e2567b219f8e9ffd23316d136204";
sha256 = "0h3i0psn5595dncv53l5m2mf13k9wcv3qi16vla5ckpskykc0xx6"; sha256 = "1prhic3pyf9n65qfg5akzkc9qv2z3ab60dpcacr7wgr9nxrvnsdq";
}; };
# TODO: Temporary workaround for compilation errors
patches = [ ./libdrm.patch ]; #./no-werror.patch
# $out for the library and $bin for rootston # $out for the library and $bin for rootston
outputs = [ "out" "bin" ]; outputs = [ "out" "bin" ];
@ -25,7 +22,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
wayland libGL wayland-protocols libinput libxkbcommon pixman wayland libGL wayland-protocols libinput libxkbcommon pixman
xcbutilwm libX11 libcap xcbutilimage xcbutilwm libX11 libcap xcbutilimage xcbutilerrors
]; ];
# Install rootston (the reference compositor) to $bin # Install rootston (the reference compositor) to $bin
@ -33,7 +30,7 @@ in stdenv.mkDerivation rec {
mkdir -p $bin/bin mkdir -p $bin/bin
cp rootston/rootston $bin/bin/ cp rootston/rootston $bin/bin/
mkdir $bin/lib mkdir $bin/lib
cp libwlroots.so $bin/lib/ cp libwlroots* $bin/lib/
patchelf --set-rpath "$bin/lib:${stdenv.lib.makeLibraryPath buildInputs}" $bin/bin/rootston patchelf --set-rpath "$bin/lib:${stdenv.lib.makeLibraryPath buildInputs}" $bin/bin/rootston
mkdir $bin/etc mkdir $bin/etc
cp ../rootston/rootston.ini.example $bin/etc/rootston.ini cp ../rootston/rootston.ini.example $bin/etc/rootston.ini

9
pkgs/development/libraries/wlroots/libdrm.patch
View File

@ -1,9 +0,0 @@
--- a/backend/meson.build 2017-10-31 22:08:01.112927610 +0100
+++ b/backend/meson.build 2017-10-31 22:09:28.155264343 +0100
@@ -43,5 +43,5 @@
'wlr_backend',
backend_files,
include_directories: wlr_inc,
- dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_render, wlr_protos],
+ dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_render, wlr_protos, drm],
)

10
pkgs/development/libraries/wlroots/no-werror.patch
View File

@ -1,10 +0,0 @@
--- a/meson.build 2017-10-31 22:08:01.132927689 +0100
+++ b/meson.build 2017-10-31 22:20:58.215784350 +0100
@@ -5,7 +5,6 @@
default_options: [
'c_std=c11',
'warning_level=2',
- 'werror=true',
],
)