diff options
Diffstat (limited to 'pkgs/applications/window-managers')
10 files changed, 89 insertions, 47 deletions
diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index 04944a1e90926..bfc360e81bbd5 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -1,19 +1,18 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub -, pkg-config , libinput , libxcb , libxkbcommon , pixman +, pkg-config , wayland , wayland-protocols , wlroots +, writeText , enable-xwayland ? true, xwayland, libX11 -, patches ? [ ] , conf ? null -, writeText -, fetchpatch +, patches ? [ ] }: let @@ -22,16 +21,17 @@ in stdenv.mkDerivation rec { pname = "dwl"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "djpohly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lfUAymLA4+E9kULZIueA+9gyVZYgaVS0oTX0LJjsSEs="; + hash = "sha256-T2GqDehBNO8eublqZUmA5WADjnwElzT+bp9Dp1bqSgg="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libinput libxcb @@ -60,6 +60,11 @@ stdenv.mkDerivation rec { else writeText "config.def.h" conf; in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; + NIX_CFLAGS_COMPILE = [ + # https://github.com/djpohly/dwl/issues/186 + "-Wno-error=unused-result" + ]; + dontConfigure = true; installPhase = '' @@ -85,8 +90,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Only; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; linux; + inherit (wayland.meta) platforms; }; } # TODO: custom patches from upstream website -# TODO: investigate the modifications in the upstream unstable version diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 4168a7f3411dc..a194a1326690d 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -8,24 +8,27 @@ , notmuch , openssl , ethtool +, lm_sensors +, iw +, iproute2 }: rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.21.2"; + version = "0.21.4"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m0Yq6uxo4FAmwvUK/b3zTb79AT9h/fgdm4Q9sf1DYe0="; + sha256 = "sha256-D/+SDKkrYfdzFw+cNBJrCshpDuFSLbr70jvFMbX3B0w="; }; - cargoSha256 = "sha256-J+829GzZ4lKrn3MSip/weaI8pExBt3uex86bKZOofg4="; + cargoSha256 = "sha256-tNwf2ShnzoSrb1R/g0hOGwQMulWYXyVCILU3Jb+Sfpg="; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ dbus libpulseaudio notmuch openssl ]; + buildInputs = [ dbus libpulseaudio notmuch openssl lm_sensors ]; buildFeatures = [ "notmuch" @@ -44,7 +47,7 @@ rustPlatform.buildRustPackage rec { ''; postFixup = '' - wrapProgram $out/bin/i3status-rs --prefix PATH : "${ethtool}/bin" + wrapProgram $out/bin/i3status-rs --prefix PATH : ${lib.makeBinPath [ iproute2 ethtool iw ]} ''; # Currently no tests are implemented, so we avoid building the package twice diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 25966fb936644..deac4bed6079a 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://www.ice-wm.org/"; + homepage = "https://ice-wm.org/"; description = "A simple, lightweight X window manager"; longDescription = '' IceWM is a window manager for the X Window System. The goal of IceWM is diff --git a/pkgs/applications/window-managers/labwc/default.nix b/pkgs/applications/window-managers/labwc/default.nix index 3bbe081646414..580fd29faa041 100644 --- a/pkgs/applications/window-managers/labwc/default.nix +++ b/pkgs/applications/window-managers/labwc/default.nix @@ -1,41 +1,47 @@ { lib , stdenv , fetchFromGitHub -, pkg-config -, meson -, ninja , cairo , glib +, libdrm , libinput +, libxcb +, libxkbcommon , libxml2 +, meson +, ninja , pango +, pkg-config +, scdoc , wayland , wayland-protocols , wlroots -, libxcb -, libxkbcommon , xwayland -, libdrm -, scdoc }: stdenv.mkDerivation rec { pname = "labwc"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { - owner = "johanmalm"; + owner = "labwc"; repo = pname; rev = version; - sha256 = "sha256-v8LGiQG/n1IXeVMPWyiP9MgZzZLW78JftvxnRVTswaM="; + hash = "sha256-O9jVDR7UROt5u8inUsZjbzB3dQTosiLYqXkeOyGrbaM="; }; + patches = [ + # Required to fix the build with wlroots 0.15.1: + ./relax-the-version-constraint-for-wlroots.patch + ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; + buildInputs = [ cairo glib @@ -54,8 +60,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dxwayland=enabled" ]; meta = with lib; { - homepage = "https://github.com/johanmalm/labwc"; - description = "Openbox alternative for Wayland"; + homepage = "https://github.com/labwc/labwc"; + description = "A Wayland stacking compositor, similar to Openbox"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/applications/window-managers/labwc/relax-the-version-constraint-for-wlroots.patch b/pkgs/applications/window-managers/labwc/relax-the-version-constraint-for-wlroots.patch new file mode 100644 index 0000000000000..9a790f285164f --- /dev/null +++ b/pkgs/applications/window-managers/labwc/relax-the-version-constraint-for-wlroots.patch @@ -0,0 +1,29 @@ +From 21d8bfcf7899f5ec50b29f523ace4c19cbfbe919 Mon Sep 17 00:00:00 2001 +From: Michael Weiss <dev.primeos@gmail.com> +Date: Fri, 4 Feb 2022 21:17:05 +0100 +Subject: [PATCH] build: Relax the version constraint for wlroots to accept + patch releases + +Patch releases only contain backwards compatible changes (mainly bug +fixes) so we want to allow them. This fixes the build with the recently +released wlroots 0.15.1 and uses the same version constraints as other +projects that depend on wlroots (e.g., Sway). +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index f950b8e..1905dda 100644 +--- a/meson.build ++++ b/meson.build +@@ -37,7 +37,7 @@ if git.found() + endif + add_project_arguments('-DLABWC_VERSION=@0@'.format(version), language: 'c') + +-wlroots_version = ['=0.15.0'] ++wlroots_version = ['>=0.15.0', '<0.16.0'] + wlroots_proj = subproject( + 'wlroots', + default_options: ['default_library=static', 'examples=false'], +-- +2.34.1 diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index 32eee9df0d839..20e29938d0c3d 100644 --- a/pkgs/applications/window-managers/picom/default.nix +++ b/pkgs/applications/window-managers/picom/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "picom"; - version = "8.2"; + version = "9"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${version}"; - sha256 = "0gjksayz2xpmgglvw17ppsan2imrd1fijs579kbf27xwp503xgfl"; + sha256 = "sha256-ym4fWOcZFlHkLUQEanC+thQLbPial7ZNzxfCWSlweWg="; fetchSubmodules = true; }; diff --git a/pkgs/applications/window-managers/picom/picom-next.nix b/pkgs/applications/window-managers/picom/picom-next.nix index 88b00c2731db9..d20d7a5eccebd 100644 --- a/pkgs/applications/window-managers/picom/picom-next.nix +++ b/pkgs/applications/window-managers/picom/picom-next.nix @@ -2,12 +2,12 @@ picom.overrideAttrs (oldAttrs: rec { pname = "picom-next"; - version = "unstable-2021-11-19"; + version = "unstable-2022-02-05"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; - rev = "1c7a4ff5a3cd5f3e25abcac0196896eea5939dce"; - sha256 = "sha256-2uy2ofXhEWKuM+nEUqU16c85UGt6fJGtPZj+az907aw="; + rev = "928963721c8789fc5f27949e8b0730771aab940d"; + sha256 = "sha256-qu9HnUG5VQbiSgduW1oR/tVvzEckaD2TWzds4R5zI+Y="; }; meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ]; }) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index ca95806b79201..b1f80d102d2a3 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -13,19 +13,20 @@ , udev , libevdev , libinput -, libX11 , libGL +, libX11 +, xwaylandSupport ? true }: stdenv.mkDerivation rec { pname = "river"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "riverwm"; repo = pname; rev = "v${version}"; - sha256 = "0mysj6fmgiwzrfzm1rk09k4xa9qiqsdwvwr59b4rs010c1gsllwk"; + sha256 = "sha256-bHfHhyDx/Wzhvhr7mAeVzJf0TBJgMTGb/ClGjWMLlQ8="; fetchSubmodules = true; }; @@ -39,9 +40,8 @@ stdenv.mkDerivation rec { udev libevdev libinput - libX11 libGL - ]; + ] ++ lib.optional xwaylandSupport libX11; dontConfigure = true; @@ -51,13 +51,13 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - zig build -Drelease-safe -Dcpu=baseline -Dxwayland -Dman-pages --prefix $out install + zig build -Drelease-safe -Dcpu=baseline ${lib.optionalString xwaylandSupport "-Dxwayland"} -Dman-pages --prefix $out install runHook postInstall ''; /* Builder patch install dir into river to get default config - When installFlags is removed, river becomes half broken. - See https://github.com/riverwm/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56 + When installFlags is removed, river becomes half broken. + See https://github.com/riverwm/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56 */ installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index be2c5bc3d6ec3..11ef2979afe00 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation { xcbutilwm ]; - sourceRoot = let + prePatch = let subdir = if stdenv.isDarwin then "osx" else "linux"; - in "source/${subdir}"; + in "cd ${subdir}"; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 598e78be26435..043e2b02a7fba 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland-scanner +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland-scanner, python3 , wayland, libGL, mesa, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev , colord, lcms2, pipewire ? null @@ -10,14 +10,14 @@ with lib; stdenv.mkDerivation rec { pname = "weston"; - version = "9.0.0"; + version = "10.0.0"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw"; + sha256 = "1bj7wnadr7ssn6xw7k8ki0wpj6np3kjd2pcysfz3h0mr290rc8sw"; }; - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner python3 ]; buildInputs = [ wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva |