Skip to content

Commit f1fca8f

Browse files
authored
hyprlock: 0.60 -> 0.6.1; hyprwayland-scanner: 0.4.2 -> 0.4.4 (NixOS#369277)
2 parents 2eeb335 + fa75c3e commit f1fca8f

File tree

4 files changed

+26
-6
lines changed

4 files changed

+26
-6
lines changed

pkgs/by-name/hy/hyprlock/package.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
hyprgraphics,
1010
hyprlang,
1111
hyprutils,
12+
hyprwayland-scanner,
1213
pam,
1314
sdbus-cpp_2,
1415
systemdLibs,
@@ -27,20 +28,19 @@
2728

2829
gcc14Stdenv.mkDerivation (finalAttrs: {
2930
pname = "hyprlock";
30-
version = "0.6.0";
31+
version = "0.6.1";
3132

3233
src = fetchFromGitHub {
3334
owner = "hyprwm";
3435
repo = "hyprlock";
3536
rev = "v${finalAttrs.version}";
36-
hash = "sha256-41/fFxlGCf1q+WJwdzSidr9+xJ7+td91XQ1+kzrZ+ts=";
37+
hash = "sha256-lT6f/5NB73xj9cVesi2SNsL5jVciwZJp8QRohiv+3Hk=";
3738
};
3839

39-
strictDeps = true;
40-
4140
nativeBuildInputs = [
4241
cmake
4342
pkg-config
43+
hyprwayland-scanner
4444
wayland-scanner
4545
];
4646

pkgs/by-name/hy/hyprpaper/package.nix

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
lib,
33
gcc14Stdenv,
44
fetchFromGitHub,
5+
fetchpatch2,
56
cmake,
67
cairo,
78
expat,
@@ -41,6 +42,15 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
4142
hash = "sha256-IRZ5NrKFwBVueYrZYUQfpTwp2rZHgAkPwgvdnfVBF8E=";
4243
};
4344

45+
patches = [
46+
# FIXME: remove in next release
47+
(fetchpatch2 {
48+
name = "fix-hypr-wayland-scanner-0.4.4-build.patch";
49+
url = "https://github.com/hyprwm/hyprpaper/commit/505e447b6c48e6b49f3aecf5da276f3cc5780054.patch?full_index=1";
50+
hash = "sha256-Vk2P2O4XQiCYqV0KbK/ADe8KPmaTs3Mg7JRJ3cGW9lM=";
51+
})
52+
];
53+
4454
nativeBuildInputs = [
4555
cmake
4656
pkg-config

pkgs/by-name/hy/hyprpicker/package.nix

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
lib,
33
stdenv,
44
fetchFromGitHub,
5+
fetchpatch2,
56
nix-update-script,
67
pkg-config,
78
cmake,
@@ -29,6 +30,15 @@ stdenv.mkDerivation (finalAttrs: {
2930
hash = "sha256-gu26MSYbTlRLMUpZ9PeYXtqqhzPDQXxEDkjiJgwzIIc=";
3031
};
3132

33+
patches = [
34+
# FIXME: remove in next release
35+
(fetchpatch2 {
36+
name = "fix-hypr-wayland-scanner-0.4.4-build.patch";
37+
url = "https://github.com/hyprwm/hyprpicker/commit/444c40e5e3dc4058a6a762ba5e73ada6d6469055.patch?full_index=1";
38+
hash = "sha256-tg+oCUHtQkOXDrUY1w1x8zWWO1v4YV8ZxQKuSWuX/AI=";
39+
})
40+
];
41+
3242
cmakeBuildType = if debug then "Debug" else "Release";
3343

3444
nativeBuildInputs = [

pkgs/by-name/hy/hyprwayland-scanner/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
}:
1010
stdenv.mkDerivation (finalAttrs: {
1111
pname = "hyprwayland-scanner";
12-
version = "0.4.2";
12+
version = "0.4.4";
1313

1414
src = fetchFromGitHub {
1515
owner = "hyprwm";
1616
repo = "hyprwayland-scanner";
1717
rev = "v${finalAttrs.version}";
18-
hash = "sha256-HIPEXyRRVZoqD6U+lFS1B0tsIU7p83FaB9m7KT/x6mQ=";
18+
hash = "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=";
1919
};
2020

2121
nativeBuildInputs = [

0 commit comments

Comments
 (0)