pyrox.dev
wlc: Downgrade back to 0.0.9
Unfortunately wlc 0.0.10 seems to be the cause for segfaults on sway,
way-cooler and orbment.
This will also build wlc with all optional packages (i.e. zlib,
valgrind and doxygen).
+3
-15
pkgs/applications/window-managers/sway/default.nix
+3
-15
pkgs/applications/window-managers/sway/default.nix
···
6
}:
7
8
let
9
version = "0.13.0";
10
-
# Temporary workaround (0.14.0 segfaults)
11
-
wlc_009 = stdenv.lib.overrideDerivation wlc (oldAttrs: rec {
12
-
name = "wlc-${version}";
13
-
version = "0.0.9";
14
-
15
-
src = fetchFromGitHub {
16
-
owner = "Cloudef";
17
-
repo = "wlc";
18
-
rev = "v${version}";
19
-
fetchSubmodules = true;
20
-
sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg";
21
-
};
22
-
});
23
in stdenv.mkDerivation rec {
24
name = "sway-${version}";
25
···
35
asciidoc libxslt docbook_xsl
36
];
37
buildInputs = [
38
-
wayland wlc_009 libxkbcommon pixman fontconfig pcre json_c dbus_libs
39
pango cairo libinput libcap xwayland pam gdk_pixbuf libpthreadstubs
40
libXdmcp
41
];
···
48
cmakeFlags = "-DVERSION=${version}";
49
installPhase = "PREFIX=$out make install";
50
51
-
LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc_009 dbus_libs ];
52
preFixup = ''
53
wrapProgram $out/bin/sway \
54
--prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}";
···
6
}:
7
8
let
9
+
# TODO: Sway 0.14.0 with wlc 0.0.10 segfaults
10
version = "0.13.0";
11
in stdenv.mkDerivation rec {
12
name = "sway-${version}";
13
···
23
asciidoc libxslt docbook_xsl
24
];
25
buildInputs = [
26
+
wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs
27
pango cairo libinput libcap xwayland pam gdk_pixbuf libpthreadstubs
28
libXdmcp
29
];
···
36
cmakeFlags = "-DVERSION=${version}";
37
installPhase = "PREFIX=$out make install";
38
39
+
LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ];
40
preFixup = ''
41
wrapProgram $out/bin/sway \
42
--prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}";
+5
-4
pkgs/development/libraries/wlc/default.nix
+5
-4
pkgs/development/libraries/wlc/default.nix
···
2
, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa
3
, libdrm, udev, libX11, libXdamage, systemd, dbus_libs, wayland-protocols
4
, libpthreadstubs, libXau, libXdmcp, libXext, libXxf86vm
5
}:
6
7
stdenv.mkDerivation rec {
8
name = "wlc-${version}";
9
-
version = "0.0.10";
10
11
src = fetchFromGitHub {
12
owner = "Cloudef";
13
repo = "wlc";
14
rev = "v${version}";
15
fetchSubmodules = true;
16
-
sha256 = "09kvwhrpgkxlagn9lgqxc80jbg56djn29a6z0n6h0dsm90ysyb2k";
17
};
18
19
nativeBuildInputs = [ cmake pkgconfig ];
···
21
buildInputs = [
22
wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa
23
libdrm udev libX11 libXdamage systemd dbus_libs wayland-protocols
24
-
libpthreadstubs libXau libXdmcp libXext libXxf86vm
25
-
];
26
27
doCheck = true;
28
checkTarget = "test";
···
2
, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa
3
, libdrm, udev, libX11, libXdamage, systemd, dbus_libs, wayland-protocols
4
, libpthreadstubs, libXau, libXdmcp, libXext, libXxf86vm
5
+
, withOptionalPackages ? true, zlib, valgrind, doxygen
6
}:
7
8
stdenv.mkDerivation rec {
9
name = "wlc-${version}";
10
+
version = "0.0.9"; # 0.0.10 currently causes segfaults
11
12
src = fetchFromGitHub {
13
owner = "Cloudef";
14
repo = "wlc";
15
rev = "v${version}";
16
fetchSubmodules = true;
17
+
sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg";
18
};
19
20
nativeBuildInputs = [ cmake pkgconfig ];
···
22
buildInputs = [
23
wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa
24
libdrm udev libX11 libXdamage systemd dbus_libs wayland-protocols
25
+
libpthreadstubs libXau libXdmcp libXext libXxf86vm ]
26
+
++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ];
27
28
doCheck = true;
29
checkTarget = "test";