Merge #313498: downgrade hyprland & hyprwayland-scanner to non-buggy versions

hyprland: 0.40.0-unstable-2024-05-12 -> 0.40.0-unstable-2024-05-05
hyprwayland-scanner: 0.3.8 -> 0.3.4
This commit is contained in:
nicoo 2024-05-25 07:13:32 +00:00 committed by GitHub
commit e9406a7a1f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 9 deletions

View File

@ -53,26 +53,23 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov
stdenv.mkDerivation (finalAttrs: {
pname = "hyprland" + lib.optionalString debug "-debug";
version = "0.40.0-unstable-2024-05-12";
version = "0.40.0-unstable-2024-05-05";
src = fetchFromGitHub {
owner = "hyprwm";
repo = finalAttrs.pname;
fetchSubmodules = true;
rev = "2ccd45a84475fab46c6fecd2fe226d3173104743";
hash = "sha256-nBCQuRl4sS/G/OUS+txeelFShBEgSk2OrN6kBYMHuOg=";
rev = "f15513309b24790099d42974274eb23f66f7c985";
hash = "sha256-zKOfgXPTlRqCR+EME4qjN9rgAnC3viI5KWx10dhKszw=";
};
postPatch = ''
# Fix hardcoded paths to /usr installation
sed -i "s#/usr#$out#" src/render/OpenGL.cpp
# Remove extra @PREFIX@ to fix pkg-config paths
sed -i "s#@PREFIX@/##g" hyprland.pc.in
'';
# used by version.sh
DATE = "2024-05-12";
DATE = "2024-05-05";
HASH = finalAttrs.src.rev;
depsBuildBuild = [

View File

@ -8,13 +8,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "hyprwayland-scanner";
version = "0.3.8";
version = "0.3.4";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprwayland-scanner";
rev = "v${finalAttrs.version}";
hash = "sha256-/DwglRvj4XF4ECdNtrCIbthleszAZBwOiXG5A6r0K/c=";
hash = "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=";
};
nativeBuildInputs = [