Skip to content

Commit

Permalink
wlroots: init at 2017-10-31
Browse files Browse the repository at this point in the history
In preparation for Sway 1.0 which will use wlroots instead of wlc.
  • Loading branch information
primeos committed Oct 31, 2017
1 parent 6798212 commit 252da8a
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 0 deletions.
35 changes: 35 additions & 0 deletions pkgs/development/libraries/wlroots/default.nix
@@ -0,0 +1,35 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
, wayland, mesa_noglu, wayland-protocols, libinput, libxkbcommon, pixman
, xcbutilwm, libX11, libcap
}:

let pname = "wlroots";
version = "unstable-2017-10-31";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchFromGitHub {
owner = "swaywm";
repo = "wlroots";
rev = "7200d643363e988edf6777c38e7f8fcd451a2c50";
sha256 = "179raymkni1xzaph32zdhg7nfin0xfzrlnbnxkcr266k9y8k66ac";
};

# TODO: Temporary workaround for compilation errors
patches = [ ./libdrm.patch ./no-werror.patch ];

nativeBuildInputs = [ meson ninja pkgconfig ];

buildInputs = [
wayland mesa_noglu wayland-protocols libinput libxkbcommon pixman
xcbutilwm libX11 libcap
];

meta = with stdenv.lib; {
description = "A modular Wayland compositor library";
inherit (src.meta) homepage;
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos ];
};
}
9 changes: 9 additions & 0 deletions pkgs/development/libraries/wlroots/libdrm.patch
@@ -0,0 +1,9 @@
--- 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 changes: 10 additions & 0 deletions pkgs/development/libraries/wlroots/no-werror.patch
@@ -0,0 +1,10 @@
--- 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',
],
)

1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
Expand Up @@ -15072,6 +15072,7 @@ with pkgs;
spectrwm = callPackage ../applications/window-managers/spectrwm { };

wlc = callPackage ../development/libraries/wlc { };
wlroots = callPackage ../development/libraries/wlroots { };
orbment = callPackage ../applications/window-managers/orbment { };
sway = callPackage ../applications/window-managers/sway { };
swaylock = callPackage ../applications/window-managers/sway { };
Expand Down

0 comments on commit 252da8a

Please sign in to comment.