diff options
Diffstat (limited to 'pkgs/applications/window-managers')
6 files changed, 7 insertions, 176 deletions
diff --git a/pkgs/applications/window-managers/gamescope/default.nix b/pkgs/applications/window-managers/gamescope/default.nix deleted file mode 100644 index a0dd62ab9494..000000000000 --- a/pkgs/applications/window-managers/gamescope/default.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ stdenv -, fetchFromGitHub -, meson -, pkg-config -, ninja -, xorg -, libdrm -, vulkan-loader -, vulkan-headers -, wayland -, wayland-protocols -, libxkbcommon -, glm -, gbenchmark -, libcap -, libavif -, SDL2 -, pipewire -, pixman -, libinput -, glslang -, hwdata -, openvr -, stb -, wlroots -, libliftoff -, libdisplay-info -, lib -, makeBinaryWrapper -, nix-update-script -, enableExecutable ? true -, enableWsi ? true -}: -let - joshShaders = fetchFromGitHub { - owner = "Joshua-Ashton"; - repo = "GamescopeShaders"; - rev = "v0.1"; - hash = "sha256-gR1AeAHV/Kn4ntiEDUSPxASLMFusV6hgSGrTbMCBUZA="; - }; -in -stdenv.mkDerivation (finalAttrs: { - pname = "gamescope"; - version = "3.14.2"; - - src = fetchFromGitHub { - owner = "ValveSoftware"; - repo = "gamescope"; - rev = "refs/tags/${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-Ym1kl9naAm1MGlxCk32ssvfiOlstHiZPy7Ga8EZegus="; - }; - - patches = [ - # Unvendor dependencies - ./use-pkgconfig.patch - - # Make it look for shaders in the right place - ./shaders-path.patch - ]; - - # We can't substitute the patch itself because substituteAll is itself a derivation, - # so `placeholder "out"` ends up pointing to the wrong place - postPatch = '' - substituteInPlace src/reshade_effect_manager.cpp --replace "@out@" "$out" - ''; - - mesonFlags = [ - (lib.mesonBool "enable_gamescope" enableExecutable) - (lib.mesonBool "enable_gamescope_wsi_layer" enableWsi) - ]; - - # don't install vendored vkroots etc - mesonInstallFlags = ["--skip-subprojects"]; - - strictDeps = true; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - meson - pkg-config - ninja - ] ++ lib.optionals enableExecutable [ - makeBinaryWrapper - glslang - ]; - - buildInputs = [ - pipewire - hwdata - xorg.libX11 - wayland - wayland-protocols - vulkan-loader - openvr - glm - ] ++ lib.optionals enableWsi [ - vulkan-headers - ] ++ lib.optionals enableExecutable [ - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXi - xorg.libXmu - xorg.libXrender - xorg.libXres - xorg.libXtst - xorg.libXxf86vm - libavif - libdrm - libliftoff - SDL2 - wlroots - libinput - libxkbcommon - gbenchmark - pixman - libcap - stb - libdisplay-info - ]; - - postInstall = lib.optionalString enableExecutable '' - # --debug-layers flag expects these in the path - wrapProgram "$out/bin/gamescope" \ - --prefix PATH : ${with xorg; lib.makeBinPath [xprop xwininfo]} - - # Install ReShade shaders - mkdir -p $out/share/gamescope/reshade - cp -r ${joshShaders}/* $out/share/gamescope/reshade/ - ''; - - passthru.updateScript = nix-update-script {}; - - meta = with lib; { - description = "SteamOS session compositing window manager"; - homepage = "https://github.com/ValveSoftware/gamescope"; - license = licenses.bsd2; - maintainers = with maintainers; [ nrdxp pedrohlc Scrumplex zhaofengli k900 ]; - platforms = platforms.linux; - mainProgram = "gamescope"; - }; -}) diff --git a/pkgs/applications/window-managers/gamescope/shaders-path.patch b/pkgs/applications/window-managers/gamescope/shaders-path.patch deleted file mode 100644 index bbdaf21a2e6f..000000000000 --- a/pkgs/applications/window-managers/gamescope/shaders-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/reshade_effect_manager.cpp b/src/reshade_effect_manager.cpp -index 3597ca1..de45250 100644 ---- a/src/reshade_effect_manager.cpp -+++ b/src/reshade_effect_manager.cpp -@@ -34,7 +34,7 @@ static std::string GetLocalUsrDir() - - static std::string GetUsrDir() - { -- return "/usr"; -+ return "@out@"; - } - - static LogScope reshade_log("gamescope_reshade"); diff --git a/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch b/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch deleted file mode 100644 index 2b4de54ae54d..000000000000 --- a/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -6,7 +6,6 @@ project( - default_options: [ - 'cpp_std=c++20', - 'warning_level=2', -- 'force_fallback_for=wlroots,libliftoff,vkroots', - ], - ) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 74635d158829..b9ced38b5fe4 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.33.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DIEWmXqs4yNIJsBBhH7khOY6RJQ9qRoSTIHN/aeBuA4="; + hash = "sha256-9lzzjb6tDfgqjAT9mS/cWfC6ucNXoJ8JJwtZ0FZqlDA="; }; - cargoHash = "sha256-5946aMSndBkXCY0jjnhPc5x9wFOC1zjJNkFkMFFOuxo="; + cargoHash = "sha256-yeijJl94v+yKMVnU/Fjzapab/nExlvoznrx8Ydz/RvM="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 3cdc2ee41db8..853ceb8a083b 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -36,12 +36,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "phosh"; - version = "0.37.0"; + version = "0.37.1"; src = fetchurl { # Release tarball which includes subprojects gvc and libcall-ui url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-kmZX2pPOYSh2hiMrRLH6744Q8rHHhE9jmG+SksepUYk="; + hash = "sha256-74H4GLFIIs97iVE8IWPxS9hALkBGkcKmrMe6/uxtPuM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 8e85597cc7d3..5cef1e0f9d68 100644 --- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -5,7 +5,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , desktop-file-utils , feedbackd , gtk4 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ninja phosh pkg-config - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ |