pyrox.dev
Merge pull request #255029 from OPNA2608/update/mir
mir: 2.14.1 -> 2.15.0
authored by
Peder Bergebakken Sundt
and committed by
GitHub
4c5b8768
0712eb06
+15
-15
pkgs/servers/mir/default.nix
+15
-15
pkgs/servers/mir/default.nix
···
1
1
{ stdenv
2
2
, lib
3
3
, fetchFromGitHub
4
+
, fetchpatch
4
5
, gitUpdater
5
6
, testers
6
7
, cmake
7
8
, pkg-config
8
9
, python3
9
-
, doxygen
10
-
, libxslt
11
10
, boost
12
11
, egl-wayland
13
12
, freetype
···
40
39
41
40
stdenv.mkDerivation (finalAttrs: {
42
41
pname = "mir";
43
-
version = "2.14.1";
42
+
version = "2.15.0";
44
43
45
44
src = fetchFromGitHub {
46
45
owner = "MirServer";
47
46
repo = "mir";
48
47
rev = "v${finalAttrs.version}";
49
-
hash = "sha256-IEGeZVNxwzHn5GASCyjNuQsnCzzfQBHdC33MWVMeZws=";
48
+
hash = "sha256-c1+gxzLEtNCjR/mx76O5QElQ8+AO4WsfcG7Wy1+nC6E=";
50
49
};
51
50
51
+
patches = [
52
+
# Fix gbm-kms tests
53
+
# Remove when version > 2.15.0
54
+
(fetchpatch {
55
+
name = "0001-mir-Fix-the-signature-of-drmModeCrtcSetGamma.patch";
56
+
url = "https://github.com/MirServer/mir/commit/98250e9c32c5b9b940da2fb0a32d8139bbc68157.patch";
57
+
hash = "sha256-tTtOHGNue5rsppOIQSfkOH5sVfFSn/KPGHmubNlRtLI=";
58
+
})
59
+
];
60
+
52
61
postPatch = ''
53
62
# Fix scripts that get run in tests
54
63
patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in
···
73
82
substituteInPlace src/platform/graphics/CMakeLists.txt \
74
83
--replace "/usr/include/drm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h" \
75
84
--replace "/usr/include/libdrm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h"
76
-
77
-
# Fix date in generated docs not honouring SOURCE_DATE_EPOCH
78
-
# Install docs to correct dir
79
-
substituteInPlace cmake/Doxygen.cmake \
80
-
--replace '"date"' '"date" "--date=@'"$SOURCE_DATE_EPOCH"'"' \
81
-
--replace "\''${CMAKE_INSTALL_PREFIX}/share/doc/mir-doc" "\''${CMAKE_INSTALL_DOCDIR}"
82
85
'';
83
86
84
87
strictDeps = true;
85
88
86
89
nativeBuildInputs = [
87
90
cmake
88
-
doxygen
89
91
glib # gdbus-codegen
90
-
libxslt
91
92
lttng-ust # lttng-gen-tp
92
93
pkg-config
93
94
(python3.withPackages (ps: with ps; [
···
137
138
wlcs
138
139
];
139
140
140
-
buildFlags = [ "all" "doc" ];
141
-
142
141
cmakeFlags = [
142
+
"-DBUILD_DOXYGEN=OFF"
143
143
"-DMIR_PLATFORM='gbm-kms;x11;eglstream-kms;wayland'"
144
144
"-DMIR_ENABLE_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}"
145
145
# BadBufferTest.test_truncated_shm_file *doesn't* throw an error as the test expected, mark as such
···
160
160
export XDG_RUNTIME_DIR=/tmp
161
161
'';
162
162
163
-
outputs = [ "out" "dev" "doc" ];
163
+
outputs = [ "out" "dev" ];
164
164
165
165
passthru = {
166
166
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;