tjh.dev
Merge pull request #245854 from OPNA2608/update/mir
+2
-18
pkgs/development/tools/wlcs/default.nix
+2
-18
pkgs/development/tools/wlcs/default.nix
···
2
2
, lib
3
3
, gitUpdater
4
4
, fetchFromGitHub
5
-
, fetchpatch
6
5
, cmake
7
6
, pkg-config
8
7
, boost
···
12
11
13
12
stdenv.mkDerivation rec {
14
13
pname = "wlcs";
15
-
version = "1.5.0";
14
+
version = "1.6.0";
16
15
17
16
src = fetchFromGitHub {
18
17
owner = "MirServer";
19
18
repo = "wlcs";
20
19
rev = "v${version}";
21
-
hash = "sha256-QxmWxu+w77/WE5pGXMWXm+NP95QmYo2O8ltZYrgCIWw=";
20
+
hash = "sha256-+YM5dT45p9wk0gJeATmhWDFJJMaUdcTfw8GLS/vMkw4=";
22
21
};
23
22
24
-
patches = [
25
-
# Improves pkg-config paths even more
26
-
# Remove when https://github.com/MirServer/wlcs/pull/260 merged & in a release
27
-
(fetchpatch {
28
-
name = "0001-wlcs-pkgsconfig-Use-better-path-concatenations.patch";
29
-
url = "https://github.com/MirServer/wlcs/pull/260/commits/20f28d82fa4dfa6a6e27212dbd6b0f2e8a833c69.patch";
30
-
hash = "sha256-m8zPD27JbX/vN2YQgNhcRsh/O+qLfvoeky5E5ZEeD1I=";
31
-
})
32
-
];
33
-
34
23
nativeBuildInputs = [
35
24
cmake
36
25
pkg-config
···
40
29
boost
41
30
gtest
42
31
wayland
43
-
];
44
-
45
-
env.NIX_CFLAGS_COMPILE = toString [
46
-
# Needed with GCC 12
47
-
"-Wno-error=maybe-uninitialized"
48
32
];
49
33
50
34
passthru.updateScript = gitUpdater {
+2
-13
pkgs/servers/mir/default.nix
+2
-13
pkgs/servers/mir/default.nix
···
1
1
{ stdenv
2
2
, lib
3
3
, fetchFromGitHub
4
-
, fetchpatch
5
4
, gitUpdater
6
5
, testers
7
6
, cmake
···
41
40
42
41
stdenv.mkDerivation (finalAttrs: {
43
42
pname = "mir";
44
-
version = "2.13.0";
43
+
version = "2.14.1";
45
44
46
45
src = fetchFromGitHub {
47
46
owner = "MirServer";
48
47
repo = "mir";
49
48
rev = "v${finalAttrs.version}";
50
-
hash = "sha256-Ip8p4mjcgmZQJTU4MNvWkTTtSJc+cCL3x1mMDFlZrVY=";
49
+
hash = "sha256-IEGeZVNxwzHn5GASCyjNuQsnCzzfQBHdC33MWVMeZws=";
51
50
};
52
-
53
-
patches = [
54
-
# Fixes Mir being able to drop first input device on launch
55
-
# Drop when https://github.com/MirServer/mir/issues/2837 fixed in a release
56
-
(fetchpatch {
57
-
name = "0001-mir-Simplify_probing_of_evdev_input_platform.patch";
58
-
url = "https://github.com/MirServer/mir/commit/7787cfa721934bb43d3255218e7c92e700923fcb.patch";
59
-
hash = "sha256-9C9qcmngd+K8EAcyOYUJFTdFDu1Nt1MM7Y9TRNOXFB4=";
60
-
})
61
-
];
62
51
63
52
postPatch = ''
64
53
# Fix scripts that get run in tests