diff options
Diffstat (limited to 'pkgs/applications/window-managers')
18 files changed, 314 insertions, 105 deletions
diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/applications/window-managers/berry/default.nix index 96054e86f5054..e044ce8485e5e 100644 --- a/pkgs/applications/window-managers/berry/default.nix +++ b/pkgs/applications/window-managers/berry/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "berry"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "JLErvin"; repo = pname; rev = version; - hash = "sha256-cs1NVwaANMIteCQuGqPcEWuUbfJulhjmfWnlU8Eb2OM="; + hash = "sha256-xMJRiLNtwVRQf9HiCF3ClLKEmdDNxcY35IYxe+L7+Hk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/e16/default.nix b/pkgs/applications/window-managers/e16/default.nix index 0fa6ff10d96a0..6e2fd639ddefb 100644 --- a/pkgs/applications/window-managers/e16/default.nix +++ b/pkgs/applications/window-managers/e16/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "e16"; - version = "1.0.25"; + version = "1.0.26"; src = fetchurl { url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz"; - hash = "sha256-rUtDaBa4vvC3gO7QSkFrphWuVOmbtkH+pRujQDaUOek="; + hash = "sha256-1FJFE4z8UT5VYv0Ef9pqi5sYq8iIbrDPKaqcUFf9dwE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/fvwm/2.6.nix b/pkgs/applications/window-managers/fvwm/2.6.nix index 44dde60ac05da..e771a170c4894 100644 --- a/pkgs/applications/window-managers/fvwm/2.6.nix +++ b/pkgs/applications/window-managers/fvwm/2.6.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "fvwm"; - version = "2.6.9"; + version = "2.7.0"; src = fetchFromGitHub { owner = "fvwmorg"; repo = pname; rev = version; - hash = "sha256-sBVOrrl2WrZ2wWN/r1kDUtR+tPwXgDoSJDaxGeFkXJI="; + hash = "sha256-KcuX8las1n8UUE/BOHj7WOeZjva5hxgpFHtATMUk3bg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/gamescope/default.nix b/pkgs/applications/window-managers/gamescope/default.nix index f6660b3c0c8fa..7e4003c68046f 100644 --- a/pkgs/applications/window-managers/gamescope/default.nix +++ b/pkgs/applications/window-managers/gamescope/default.nix @@ -26,7 +26,7 @@ }: let pname = "gamescope"; - version = "3.11.47"; + version = "3.11.48"; in stdenv.mkDerivation { inherit pname version; @@ -35,7 +35,7 @@ stdenv.mkDerivation { owner = "Plagman"; repo = "gamescope"; rev = "refs/tags/${version}"; - hash = "sha256-GkvujrYc7dBbsGqeG0THqtEAox+VZ3DoWQK4gkHo+ds="; + hash = "sha256-/a0fW0NVIrg9tuK+mg+D+IOcq3rJJxKdFwspM1ZRR9M="; }; patches = [ ./use-pkgconfig.patch ]; diff --git a/pkgs/applications/window-managers/hyprland/default.nix b/pkgs/applications/window-managers/hyprland/default.nix deleted file mode 100644 index 50b52a01d6049..0000000000000 --- a/pkgs/applications/window-managers/hyprland/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, libdrm -, libinput -, libxcb -, libxkbcommon -, mesa -, pango -, wayland -, wayland-protocols -, wayland-scanner -, wlroots -, xcbutilwm -}: - -stdenv.mkDerivation rec { - pname = "hyprland"; - version = "0.6.1beta"; - - # When updating Hyprland, the overridden wlroots commit must be bumped to match the commit upstream uses. - src = fetchFromGitHub { - owner = "hyprwm"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-0Msqe2ErAJvnO1zHoB2k6TkDhTYnHRGkvJrfSG12dTU="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - wayland-scanner - ]; - - buildInputs = [ - libdrm - libinput - libxcb - libxkbcommon - mesa - pango - wayland - wayland-protocols - wlroots - xcbutilwm - ]; - - # build with system wlroots - postPatch = '' - sed -Ei 's/"\.\.\/wlroots\/include\/([a-zA-Z0-9./_-]+)"/<\1>/g' src/includes.hpp - ''; - - preConfigure = '' - make protocols - ''; - - postBuild = '' - pushd ../hyprctl - $CXX -std=c++20 -w ./main.cpp -o ./hyprctl - popd - ''; - - installPhase = '' - mkdir -p $out/bin - install -m755 ./Hyprland $out/bin - install -m755 ../hyprctl/hyprctl $out/bin - ''; - - meta = with lib; { - homepage = "https://github.com/vaxerski/Hyprland"; - description = "A dynamic tiling Wayland compositor that doesn't sacrifice on its looks"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ wozeparrot ]; - mainProgram = "Hyprland"; - }; -} diff --git a/pkgs/applications/window-managers/hyprwm/hypr/000-dont-set-compiler.diff b/pkgs/applications/window-managers/hyprwm/hypr/000-dont-set-compiler.diff new file mode 100644 index 0000000000000..b12763b82f696 --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hypr/000-dont-set-compiler.diff @@ -0,0 +1,18 @@ +diff -Naur source-old/CMakeLists.txt source/CMakeLists.txt +--- source-old/CMakeLists.txt 2022-10-19 00:55:52.766480588 -0300 ++++ source/CMakeLists.txt 2022-10-19 00:56:08.368515654 -0300 +@@ -1,7 +1,5 @@ + cmake_minimum_required(VERSION 3.4) + +-set(CMAKE_CXX_COMPILER "/bin/g++") +- + project(Hypr + VERSION 0.1 + DESCRIPTION "A Modern OOP C++ Window Manager" +@@ -54,4 +52,4 @@ + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg -no-pie -fno-builtin") + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg -no-pie -fno-builtin") + SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pg -no-pie -fno-builtin") +-ENDIF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG) +\ No newline at end of file ++ENDIF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG) diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix new file mode 100644 index 0000000000000..673fa90c5005b --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, fetchFromGitHub +, cairo +, cmake +, glib +, gtkmm3 +, harfbuzz +, libX11 +, libXdmcp +, libxcb +, makeWrapper +, pcre2 +, pkg-config +, xcbutilcursor +, xcbutilkeysyms +, xcbutilwm +, xmodmap +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hypr"; + version = "unstable-2022-05-25"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "Hypr"; + rev = "3e3d943c446ae77c289611a1a875c8dff8883c1e"; + hash = "sha256-lyaGGm53qxg7WVoFxZ7kerLe12P1N3JbN8nut6oZS50="; + }; + + patches = [ + ./000-dont-set-compiler.diff + ]; + + nativeBuildInputs = [ + cmake + makeWrapper + pkg-config + ]; + + buildInputs = [ + cairo + glib + gtkmm3 + harfbuzz + libX11 + libXdmcp + libxcb + pcre2 + xcbutilcursor + xcbutilkeysyms + xcbutilwm + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 Hypr -t $out/bin + + runHook postInstall + ''; + + postFixup = '' + wrapProgram $out/bin/Hypr --prefix PATH : ${lib.makeBinPath [ xmodmap ]} + ''; + + meta = with lib; { + inherit (finalAttrs.src.meta) homepage; + description = "A tiling X11 window manager written in modern C++"; + license = licenses.bsd3; + maintainers = with maintainers; [ AndersonTorres ]; + inherit (libX11.meta) platforms; + broken = stdenv.isDarwin; # xcb/xcb_atom.h not found + mainProgram = "Hypr"; + }; +}) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix new file mode 100644 index 0000000000000..c5733ffa68fb8 --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -0,0 +1,96 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchFromGitLab +, cmake +, libdrm +, libinput +, libxcb +, libxkbcommon +, mesa +, pango +, pkg-config +, wayland +, wayland-protocols +, wayland-scanner +, wlroots +, xcbutilwm +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hyprland"; + version = "0.6.1beta"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "Hyprland"; + rev = "v${finalAttrs.version}"; + hash = "sha256-0Msqe2ErAJvnO1zHoB2k6TkDhTYnHRGkvJrfSG12dTU="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wayland-scanner + ]; + + buildInputs = [ + libdrm + libinput + libxcb + libxkbcommon + mesa + pango + wayland + wayland-protocols + xcbutilwm + ] + ++ [ + # INFO: When updating src, remember to synchronize this wlroots with the + # exact commit used by upstream + (wlroots.overrideAttrs (_: { + version = "unstable-2022-06-07"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "wlroots"; + repo = "wlroots"; + rev = "b89ed9015c3fbe8d339e9d65cf70fdca6e5645bc"; + hash = "sha256-8y3u8CoigjoZOVbA2wCWBHlDNEakv0AVxU46/cOC00s="; + }; + })) + ]; + + # build with system wlroots + postPatch = '' + sed -Ei 's|"\.\./wlroots/include/([a-zA-Z0-9./_-]+)"|<\1>|g' src/includes.hpp + ''; + + preConfigure = '' + make protocols + ''; + + postBuild = '' + pushd ../hyprctl + ${stdenv.cc.targetPrefix}c++ -std=c++20 -w ./main.cpp -o ./hyprctl + popd + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 ../hyprctl/hyprctl ./Hyprland -t $out/bin + + runHook postInstall + ''; + + meta = with lib; { + inherit (finalAttrs.src.meta) homepage; + description = "A dynamic tiling Wayland compositor that doesn't sacrifice on its looks"; + license = licenses.bsd3; + maintainers = with maintainers; [ wozeparrot ]; + inherit (wayland.meta) platforms; + mainProgram = "Hyprland"; + # ofborg failure: g++ does not recognize '-std=c++23' + broken = stdenv.isAarch64; + }; +}) diff --git a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix new file mode 100644 index 0000000000000..8362097ddf9ed --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libjpeg +, mesa +, pango +, pkg-config +, wayland +, wayland-protocols +, wayland-scanner +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hyprpaper"; + version = "unstable-2022-09-30"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "hyprpaper"; + rev = "8f4c712950ad6a9bc7c7281c15a63f5fa06ba92b"; + hash = "sha256-KojBifIOkJ2WmO/lRjQIgPgUnX5Eu10U4VDg+1MB2co="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wayland-scanner + ]; + + buildInputs = [ + libjpeg + mesa + pango + wayland + wayland-protocols + ]; + + prePatch = '' + substituteInPlace src/main.cpp \ + --replace GIT_COMMIT_HASH '"${finalAttrs.src.rev}"' + ''; + + preConfigure = '' + make protocols + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 ./hyprpaper -t $out/bin + + runHook postInstall + ''; + + meta = with lib; { + inherit (finalAttrs.src.meta) homepage; + description = "A blazing fast wayland wallpaper utility"; + license = licenses.bsd3; + maintainers = with maintainers; [ wozeparrot ]; + inherit (wayland.meta) platforms; + # ofborg failure: g++ does not recognize '-std=c++23' + broken = stdenv.isAarch64; + }; +}) diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index d9a103035668c..3ddca4d40fd37 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -4,6 +4,7 @@ , fetchpatch , cmake , expat +, flac , fontconfig , freetype , fribidi @@ -26,26 +27,27 @@ , libXpm , libXrandr , libjpeg +, libogg , libpng , libpthreadstubs , libsndfile , libtiff , libxcb , mkfontdir -, pcre +, pcre2 , perl , pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "3.0.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "ice-wm"; - repo = pname; - rev = version; - hash = "sha256-0mnhH/7Y4VXpNUU++ln2//9/vuTxq9sa2D933Cf7Ifw="; + repo = "icewm"; + rev = finalAttrs.version; + hash = "sha256-fTaWfItY//fkvaYADeCBYg+dag59Y9Fw+Al0UgHnkXc="; }; nativeBuildInputs = [ @@ -56,6 +58,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat + flac fontconfig freetype fribidi @@ -78,13 +81,14 @@ stdenv.mkDerivation rec { libXpm libXrandr libjpeg + libogg libpng libpthreadstubs libsndfile libtiff libxcb mkfontdir - pcre + pcre2 ]; cmakeFlags = [ @@ -94,7 +98,8 @@ stdenv.mkDerivation rec { # install legacy themes postInstall = '' - cp -r ../lib/themes/{gtk2,Natural,nice,nice2,warp3,warp4,yellowmotif} $out/share/icewm/themes/ + cp -r ../lib/themes/{gtk2,Natural,nice,nice2,warp3,warp4,yellowmotif} \ + $out/share/icewm/themes/ ''; meta = with lib; { @@ -117,4 +122,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index 30328cd7719a3..6fb504144b6cf 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }: +{ lib, stdenv, fetchurl, lua, gettext, groff, libICE, libSM, libX11, libXext }: stdenv.mkDerivation rec { pname = "ion"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns"; }; - buildInputs = [ xlibsWrapper lua gettext groff ]; + buildInputs = [ libICE libSM libX11 libXext lua gettext groff ]; buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" "PREFIX=\${out}" ]; diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index fb89731a8461b..18df9da344d41 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "jwm"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; rev = "v${version}"; - sha256 = "sha256-rvuz2Pmon3XBqRMgDwZNrQlWDyLNSK30JPmmQTlN+Rs="; + sha256 = "sha256-HPcNXf+frYbT8lr5vU5xpUnyjGpQ5rc2G14EjDwpk3c="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index e59103d7d6d04..4e546c0671556 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -2,7 +2,7 @@ , lua, gettext, which, groff, xmessage, xterm , readline, fontconfig, libX11, libXext, libSM , libXinerama, libXrandr, libXft -, xlibsWrapper, makeWrapper +, makeWrapper }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config makeWrapper groff ]; buildInputs = [ lua gettext which readline fontconfig libX11 libXext libSM - libXinerama libXrandr libXft xlibsWrapper ]; + libXinerama libXrandr libXft ]; buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" ]; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 5c48953e79e35..332fd509e421d 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { description = "A pure Wayland shell prototype for GNOME on mobile devices"; homepage = "https://gitlab.gnome.org/World/Phosh/phosh"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jtojnar masipcat zhaofengli ]; + maintainers = with maintainers; [ masipcat zhaofengli ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/picom/picom-jonaburg.nix b/pkgs/applications/window-managers/picom/picom-jonaburg.nix new file mode 100644 index 0000000000000..9b018a281377b --- /dev/null +++ b/pkgs/applications/window-managers/picom/picom-jonaburg.nix @@ -0,0 +1,18 @@ +{ picom, lib, fetchFromGitHub }: + +picom.overrideAttrs (oldAttrs: rec { + pname = "picom-jonaburg"; + version = "unstable-2022-03-19"; + src = fetchFromGitHub { + owner = "jonaburg"; + repo = "picom"; + rev = "e3c19cd7d1108d114552267f302548c113278d45"; + sha256 = "sha256-4voCAYd0fzJHQjJo4x3RoWz5l3JJbRvgIXn1Kg6nz6Y="; + }; + + meta = with lib; { + description = "A fork of picom featuring animations and improved rounded corners."; + homepage = "https://github.com/jonaburg/picom"; + maintainers = with maintainers; oldAttrs.meta.maintainers ++ [ quasigod-io ]; + }; +}) diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index f75d7ec5d1bd7..ef001787a596f 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -8,6 +8,7 @@ , imlib , libICE , libSM +, libxcrypt , libXinerama , libXrandr , libXtst @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { imlib libICE libSM + libxcrypt libXinerama libXrandr libXtst diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index 2afb6e505c336..062fc2a3771da 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -6,7 +6,7 @@ let ] ++ packages self); in stdenv.mkDerivation { pname = "taffybar-with-packages"; - inherit (taffybarEnv) version; + inherit (taffybar) version; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/window-managers/waybox/default.nix b/pkgs/applications/window-managers/waybox/default.nix index ad3028b4ac039..4fab495441131 100644 --- a/pkgs/applications/window-managers/waybox/default.nix +++ b/pkgs/applications/window-managers/waybox/default.nix @@ -6,6 +6,7 @@ , ninja , libxkbcommon , wayland +, wayland-scanner , wayland-protocols , wlroots , pixman @@ -25,7 +26,13 @@ stdenv.mkDerivation rec { hash = "sha256-G32cGmOwmnuVlj1hCq9NRti6plJbkAktfzM4aYzQ+k8="; }; - nativeBuildInputs = [ pkg-config meson ninja ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + wayland-scanner + ]; + buildInputs = [ libxkbcommon wayland |