hyprland: unstable-2023-08-15 -> 0.29.1

This commit is contained in:
Mihai Fufezan 2023-09-06 22:39:46 +03:00 committed by Jörg Thalheim
parent fcbfef1e43
commit 8f4341b144
3 changed files with 7 additions and 11 deletions

View File

@ -40,22 +40,18 @@ assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been renam
assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland";
stdenv.mkDerivation (finalAttrs: {
pname = "hyprland" + lib.optionalString debug "-debug";
version = "unstable-2023-08-15";
version = "0.29.1";
src = fetchFromGitHub {
owner = "hyprwm";
repo = finalAttrs.pname;
rev = "91e28bbe9df85e2e94fbcc0137106362aea14ab5";
hash = "sha256-1vLms49ZgDOC9y1uTjfph3WrUpatKRLnKAvFmSNre20=";
rev = "v${finalAttrs.version}";
hash = "sha256-j9ypIwZkotNZMyk8R/W002OzDHd0C0OHSKE7uOFpf2k=";
};
patches = [
# make meson use the provided dependencies instead of the git submodules
"${finalAttrs.src}/nix/patches/meson-build.patch"
# look into $XDG_DESKTOP_PORTAL_DIR instead of /usr; runtime checks for conflicting portals
# NOTE: revert back to the patch inside SRC on the next version bump
# "${finalAttrs.src}/nix/patches/portals.patch"
./portals.patch
];
postPatch = ''

View File

@ -42,8 +42,8 @@ wlroots.overrideAttrs
domain = "gitlab.freedesktop.org";
owner = "wlroots";
repo = "wlroots";
rev = "e8d545a9770a2473db32e0a0bfa757b05d2af4f3";
hash = "sha256-gv5kjss6REeQG0BmvK2gTx7jHLRdCnP25po6It6I6N8=";
rev = "717ded9bb0191ea31bf4368be32e7a15fe1b8294";
hash = "sha256-eBKkG7tMxg92NskEn8dHRFY245JwjirWRoOZzW6DnUw=";
};
pname =

View File

@ -5684,8 +5684,8 @@ with pkgs;
hyprdim = callPackage ../applications/misc/hyprdim { };
hyprland = callPackage ../applications/window-managers/hyprwm/hyprland {
wlroots = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { };
udis86 = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { };
wlroots = callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { };
udis86 = callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { };
};
hyprland-autoname-workspaces = callPackage ../applications/misc/hyprland-autoname-workspaces { };