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).

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