gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mir: 2.17.2 -> 2.18.0

Browse Source
This commit is contained in:
OPNA2608
2024-09-27 22:06:53 +02:00
parent 443e1337c4
commit c1295e6164
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/mir/common.nix
+24 -20
View File
@@ -12,6 +12,7 @@
glib,
glm,
glog,
libapparmor,
libdrm,
libepoxy,
libevdev,
@@ -58,28 +59,31 @@ stdenv.mkDerivation (finalAttrs: {
inherit patches;
postPatch = ''
# Fix scripts that get run in tests
patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in
postPatch =
''
# Fix scripts that get run in tests
patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in
# Fix LD_PRELOADing in tests
substituteInPlace \
cmake/MirCommon.cmake \
tests/umock-acceptance-tests/CMakeLists.txt \
tests/unit-tests/platforms/gbm-kms/kms/CMakeLists.txt \
tests/unit-tests/CMakeLists.txt \
--replace-warn 'LD_PRELOAD=liblttng-ust-fork.so' 'LD_PRELOAD=${lib.getLib lttng-ust}/lib/liblttng-ust-fork.so' \
--replace-warn 'LD_PRELOAD=libumockdev-preload.so.0' 'LD_PRELOAD=${lib.getLib umockdev}/lib/libumockdev-preload.so.0'
# Fix LD_PRELOADing in tests
substituteInPlace \
cmake/MirCommon.cmake \
tests/umock-acceptance-tests/CMakeLists.txt \
tests/unit-tests/platforms/gbm-kms/kms/CMakeLists.txt \
tests/unit-tests/CMakeLists.txt \
--replace-warn 'LD_PRELOAD=liblttng-ust-fork.so' 'LD_PRELOAD=${lib.getLib lttng-ust}/lib/liblttng-ust-fork.so' \
--replace-warn 'LD_PRELOAD=libumockdev-preload.so.0' 'LD_PRELOAD=${lib.getLib umockdev}/lib/libumockdev-preload.so.0'
# Fix Xwayland default
substituteInPlace src/miral/x11_support.cpp \
--replace-fail '/usr/bin/Xwayland' '${lib.getExe xwayland}'
# Fix Xwayland default
substituteInPlace src/miral/x11_support.cpp \
--replace-fail '/usr/bin/Xwayland' '${lib.getExe xwayland}'
''
+ lib.optionalString (lib.strings.versionOlder version "2.18.0") ''
# Fix paths for generating drm-formats
substituteInPlace src/platform/graphics/CMakeLists.txt \
--replace-fail "/usr/include/drm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h" \
--replace-fail "/usr/include/libdrm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h"
'';
# Fix paths for generating drm-formats
substituteInPlace src/platform/graphics/CMakeLists.txt \
--replace-fail "/usr/include/drm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h" \
--replace-fail "/usr/include/libdrm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h"
'';
strictDeps = true;
@@ -127,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
xorg.libXcursor
xorg.xorgproto
xwayland
];
] ++ lib.optionals (lib.strings.versionAtLeast version "2.18.0") [ libapparmor ];
nativeCheckInputs = [
dbus
pkgs/servers/mir/default.nix
+2 -2
View File
@@ -5,8 +5,8 @@ let
in
{
mir = common {
version = "2.17.2";
hash = "sha256-OwOGt3X7+UchksyPf/sodit2PHpSlpP2S3gkCPcdzfE=";
version = "2.18.0";
hash = "sha256-Sy7sDlOP34M9zyNorX0loP21B/dd/7Zew8wcuEcjjUY=";
};
mir_2_15 = common {