diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2017-09-27 20:17:58 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2017-09-27 20:21:50 +0200 |
commit | 2d640b9d6ee45e46ff510744e849175e9cb55d05 (patch) | |
tree | 24e885a85d535fc61936a2902cc5f311cf6b1c1c | |
parent | 4013b381b37212201f7c81bcee3a45b890489b3e (diff) |
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).
-rw-r--r-- | pkgs/applications/window-managers/sway/default.nix | 18 | ||||
-rw-r--r-- | pkgs/development/libraries/wlc/default.nix | 9 |
2 files changed, 8 insertions, 19 deletions
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 274325b678580..2c94f7f6fecc8 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -6,20 +6,8 @@ }: let + # TODO: Sway 0.14.0 with wlc 0.0.10 segfaults version = "0.13.0"; - # Temporary workaround (0.14.0 segfaults) - wlc_009 = stdenv.lib.overrideDerivation wlc (oldAttrs: rec { - name = "wlc-${version}"; - version = "0.0.9"; - - src = fetchFromGitHub { - owner = "Cloudef"; - repo = "wlc"; - rev = "v${version}"; - fetchSubmodules = true; - sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg"; - }; - }); in stdenv.mkDerivation rec { name = "sway-${version}"; @@ -35,7 +23,7 @@ in stdenv.mkDerivation rec { asciidoc libxslt docbook_xsl ]; buildInputs = [ - wayland wlc_009 libxkbcommon pixman fontconfig pcre json_c dbus_libs + wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap xwayland pam gdk_pixbuf libpthreadstubs libXdmcp ]; @@ -48,7 +36,7 @@ in stdenv.mkDerivation rec { cmakeFlags = "-DVERSION=${version}"; installPhase = "PREFIX=$out make install"; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc_009 dbus_libs ]; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ]; preFixup = '' wrapProgram $out/bin/sway \ --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}"; diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 936c88034aad4..c67070094de6e 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -2,18 +2,19 @@ , wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa , libdrm, udev, libX11, libXdamage, systemd, dbus_libs, wayland-protocols , libpthreadstubs, libXau, libXdmcp, libXext, libXxf86vm +, withOptionalPackages ? true, zlib, valgrind, doxygen }: stdenv.mkDerivation rec { name = "wlc-${version}"; - version = "0.0.10"; + version = "0.0.9"; # 0.0.10 currently causes segfaults src = fetchFromGitHub { owner = "Cloudef"; repo = "wlc"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "09kvwhrpgkxlagn9lgqxc80jbg56djn29a6z0n6h0dsm90ysyb2k"; + sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -21,8 +22,8 @@ stdenv.mkDerivation rec { buildInputs = [ wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa libdrm udev libX11 libXdamage systemd dbus_libs wayland-protocols - libpthreadstubs libXau libXdmcp libXext libXxf86vm - ]; + libpthreadstubs libXau libXdmcp libXext libXxf86vm ] + ++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ]; doCheck = true; checkTarget = "test"; |