Merge branch 'staging-next' into staging

2021-05-08 20:59:05 +02:00
parent 252bf94a74 6d46d8a9b9
commit dd78ce1c53
730 changed files with 3907 additions and 1907 deletions
@@ -1,7 +1,7 @@
 { fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms
 , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev
 , yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon
-, xorgserver, xvfb_run }:
+, xorgserver, xvfb-run }:

 stdenv.mkDerivation rec {
  pname = "i3";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
    libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango
    perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun
    perlPackages.ExtUtilsPkgConfig perlPackages.InlineC
-    xorgserver xvfb_run
+    xorgserver xvfb-run
  ];

  configureFlags = [ "--disable-builddir" ];