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).
NixOS · Sep 27, 2017 · 2d640b9 · 2d640b9
1 parent 4013b38
commit 2d640b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 19 deletions.
diff --git 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
@@ -2,27 +2,28 @@
 , 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 ];
 
   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";