From a267891f09ffaddc245fa983faaabc9269d870d1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 12 Nov 2024 14:58:02 +0100 Subject: [PATCH] i3: reformat with nixfmt-rfc-style --- .../window-managers/i3/default.nix | 108 ++++++++++++++---- 1 file changed, 86 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 26a46ab4cfef..4e32b76380c4 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,9 +1,38 @@ -{ fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms -, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre2, libev -, yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon -, xorgserver, xvfb-run, xdotool, xorg, which -, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs -, nixosTests +{ + fetchurl, + lib, + stdenv, + pkg-config, + makeWrapper, + meson, + ninja, + installShellFiles, + libxcb, + xcbutilkeysyms, + xcbutil, + xcbutilwm, + xcbutilxrm, + libstartup_notification, + libX11, + pcre2, + libev, + yajl, + xcb-util-cursor, + perl, + pango, + perlPackages, + libxkbcommon, + xorgserver, + xvfb-run, + xdotool, + xorg, + which, + asciidoc, + xmlto, + docbook_xml_dtd_45, + docbook_xsl, + findXMLCatalogs, + nixosTests, }: stdenv.mkDerivation rec { @@ -16,8 +45,17 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkg-config makeWrapper meson ninja installShellFiles perl - asciidoc xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs + pkg-config + makeWrapper + meson + ninja + installShellFiles + perl + asciidoc + xmlto + docbook_xml_dtd_45 + docbook_xsl + findXMLCatalogs ]; mesonFlags = [ @@ -25,14 +63,36 @@ stdenv.mkDerivation rec { "-Dmans=true" ]; - buildInputs = [ - libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon - libstartup_notification libX11 pcre2 libev yajl xcb-util-cursor perl pango - perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun - perlPackages.ExtUtilsPkgConfig perlPackages.InlineC - ] ++ lib.optionals doCheck [ - xorgserver xvfb-run xdotool xorg.setxkbmap xorg.xrandr which - ]; + buildInputs = + [ + libxcb + xcbutilkeysyms + xcbutil + xcbutilwm + xcbutilxrm + libxkbcommon + libstartup_notification + libX11 + pcre2 + libev + yajl + xcb-util-cursor + perl + pango + perlPackages.AnyEventI3 + perlPackages.X11XCB + perlPackages.IPCRun + perlPackages.ExtUtilsPkgConfig + perlPackages.InlineC + ] + ++ lib.optionals doCheck [ + xorgserver + xvfb-run + xdotool + xorg.setxkbmap + xorg.xrandr + which + ]; configureFlags = [ "--disable-builddir" ]; @@ -79,16 +139,20 @@ stdenv.mkDerivation rec { separateDebugInfo = true; - passthru.tests = { inherit (nixosTests) i3wm; }; - + passthru.tests = { + inherit (nixosTests) i3wm; + }; meta = with lib; { description = "Tiling window manager"; - homepage = "https://i3wm.org"; - maintainers = with maintainers; [ modulistic fpletz ]; + homepage = "https://i3wm.org"; + maintainers = with maintainers; [ + modulistic + fpletz + ]; mainProgram = "i3"; - license = licenses.bsd3; - platforms = platforms.all; + license = licenses.bsd3; + platforms = platforms.all; longDescription = '' A tiling window manager primarily targeted at advanced users and