diff options
Diffstat (limited to 'pkgs/applications/window-managers')
10 files changed, 53 insertions, 73 deletions
diff --git a/pkgs/applications/window-managers/dk/default.nix b/pkgs/applications/window-managers/dk/default.nix index 25fcad2ba0b6c..631e7b85d18eb 100644 --- a/pkgs/applications/window-managers/dk/default.nix +++ b/pkgs/applications/window-managers/dk/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dk"; - version = "2.1"; + version = "2.2"; src = fetchFromBitbucket { owner = "natemaia"; repo = "dk"; rev = "v${finalAttrs.version}"; - hash = "sha256-bUt4Se4Gu7CZEdv1/VpU92ncq2MBKXG7T4Wpa/2rocI="; + hash = "sha256-u1fZTcfGLwKFeRADU55MFYDvtSOaOg5qtWB90xYpVuY="; }; buildInputs = [ diff --git a/pkgs/applications/window-managers/eww/default.nix b/pkgs/applications/window-managers/eww/default.nix deleted file mode 100644 index b245941fc7d49..0000000000000 --- a/pkgs/applications/window-managers/eww/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, wrapGAppsHook -, gtk3 -, librsvg -, gtk-layer-shell -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "eww"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "elkowar"; - repo = "eww"; - rev = "v${version}"; - hash = "sha256-HBBz1NDtj2TnDK5ghDLRrAOwHXDZlzclvVscYnmKGck="; - }; - - cargoHash = "sha256-IirFE714NZmppLjwbWk6fxcmRXCUFzB4oxOxBvmYu5U="; - - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - - buildInputs = [ gtk3 librsvg gtk-layer-shell ]; - - cargoBuildFlags = [ "--bin" "eww" ]; - - cargoTestFlags = cargoBuildFlags; - - # requires unstable rust features - RUSTC_BOOTSTRAP = 1; - - meta = with lib; { - description = "ElKowars wacky widgets"; - homepage = "https://github.com/elkowar/eww"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda lom coffeeispower ]; - mainProgram = "eww"; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/applications/window-managers/hackedbox/default.nix b/pkgs/applications/window-managers/hackedbox/default.nix index f38d0d6beb9b1..45f17c0c912ed 100644 --- a/pkgs/applications/window-managers/hackedbox/default.nix +++ b/pkgs/applications/window-managers/hackedbox/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; + CXXFLAGS = "-std=c++98"; + buildInputs = [ freetype fribidi diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index e8da21dba912b..4d50b39ebedad 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -49,13 +49,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.38.1"; - + version = "0.39.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-6y422rx8ScSkjR1dNYGYUxBmFewRYlCz9XZZ+XrVZng="; + hash = "sha256-Urb/njWiHYUudXpmK8EKl9Z58esTIG0PxXw5LuM2r5g="; }; patches = [ @@ -73,11 +72,16 @@ stdenv.mkDerivation (finalAttrs: { --replace "@HASH@" '${finalAttrs.src.rev}' \ --replace "@BRANCH@" "" \ --replace "@MESSAGE@" "" \ - --replace "@DATE@" "2024-04-06" \ + --replace "@DATE@" "2024-04-16" \ --replace "@TAG@" "" \ --replace "@DIRTY@" "" ''; + depsBuildBuild = [ + # to find wayland-scanner when cross-compiling + pkg-config + ]; + nativeBuildInputs = [ jq makeWrapper @@ -94,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = - [ + wlr.buildInputs ++ [ cairo git hyprcursor diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix index 53113b3e8bffd..76754dd5f0d8a 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix @@ -24,13 +24,13 @@ let hy3 = { fetchFromGitHub, cmake, hyprland }: mkHyprlandPlugin hyprland { pluginName = "hy3"; - version = "0.38.0"; + version = "0.39.1"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; - rev = "hl0.38.0"; - hash = "sha256-ZVwX5yM97R6MLk64dQG5KqYOR4L4HxEEV+xzQi+NGrk="; + rev = "hl0.39.1"; + hash = "sha256-PqVld+oFziSt7VZTNBomPyboaMEAIkerPQFwNJL/Wjw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix index d5be9f276cf25..b2f4a52126dcf 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix @@ -1,4 +1,4 @@ -{ fetchFromGitLab +{ fetchFromGitHub , wlroots , enableXWayland ? true }: @@ -7,12 +7,11 @@ wlroots.overrideAttrs inherit enableXWayland; version = "0.18.0-dev"; - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "wlroots"; - repo = "wlroots"; - rev = "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b"; - hash = "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8="; + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "wlroots-hyprland"; + rev = "611a4f24cd2384378f6e500253983107c6656c64"; + hash = "sha256-vPeZCY+sdiGsz4fl3AVVujfyZyQBz6+vZdkUE4hQ+HI="; }; patches = [ ]; # don't inherit old.patches diff --git a/pkgs/applications/window-managers/jay/default.nix b/pkgs/applications/window-managers/jay/default.nix index 6718caf1ada23..6b7951c14c374 100644 --- a/pkgs/applications/window-managers/jay/default.nix +++ b/pkgs/applications/window-managers/jay/default.nix @@ -7,20 +7,30 @@ , mesa , pango , udev +, shaderc +, libglvnd +, vulkan-loader +, autoPatchelfHook }: rustPlatform.buildRustPackage rec { pname = "jay"; - version = "unstable-2022-11-20"; + version = "1.1.0"; src = fetchFromGitHub { owner = "mahkoh"; repo = pname; - rev = "09b4668a5363a6e93dfb8ba35b244835f4edb0f2"; - sha256 = "sha256-0IIzXY7AFTGEe0TzJVKOtTPUZee0Wz40yKgEWLeIYJw="; + rev = "v${version}"; + sha256 = "sha256-9fWwVUqeYADt33HGaJRRFmM20WM7qRWbNGpt3rk9xQM="; }; - cargoSha256 = "sha256-zSq6YBlm6gJXGlF9xZ8gWSTMewdNqrJzwP58a0x8QIU="; + cargoSha256 = "sha256-oPGY/rVx94BkWgKkwwyDjfASMyGGU32R5IZuNjOv+EM="; + + SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; + + nativeBuildInputs = [ + autoPatchelfHook + ]; buildInputs = [ libGL @@ -29,9 +39,18 @@ rustPlatform.buildRustPackage rec { pango udev libinput + shaderc + ]; + + runtimeDependencies = [ + libglvnd + vulkan-loader ]; - RUSTC_BOOTSTRAP = 1; + postInstall = '' + install -D etc/jay.portal $out/usr/share/xdg-desktop-portal/portals/jay.portal + install -D etc/jay-portals.conf $out/usr/share/xdg-desktop-portal/jay-portals.conf + ''; meta = with lib; { description = "A Wayland compositor written in Rust"; diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix index 7e59995126fad..8575c10a6ad64 100644 --- a/pkgs/applications/window-managers/miriway/default.nix +++ b/pkgs/applications/window-managers/miriway/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "unstable-2024-04-16"; + version = "0-unstable-2024-04-25"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "d7f43ac201e6f1aa7aeee668f5d16683f48917f1"; - hash = "sha256-hUTK7kd7gTvms4HMF7BgYWomRYZyRkqUfjhVtEF+YRE="; + rev = "a3f074be78e77bab378f064452420923b6f9c331"; + hash = "sha256-D+ClEJL/iCLARaTXe5QpI/uHE61Lajzz5A5EphgHCl8="; }; strictDeps = true; diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index fec3b1bfc7163..df1b1cfea9b83 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , wayfire , wf-shell , wayland-scanner @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config wayland-scanner - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index b4472425324ee..a4e36c18368e6 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "weston"; - version = "13.0.0"; + version = "13.0.1"; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz"; - hash = "sha256-Uv8dSqI5Si5BbIWjOLYnzpf6cdQ+t2L9Sq8UXTb8eVo="; + hash = "sha256-6hVmq09f/Ofp/U96H8pbMMquTVACO/RZITmUCU4Cspo="; }; postPatch = '' |