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

lomiri.qtmir: Fix typo in comment, pull comments out of shell code

Browse Source 
Typo fix causes rebuild, which is silly. Pull comments out of executed shell code to avoid that in the future.
This commit is contained in:
OPNA2608
2026-05-19 09:43:01 +02:00
parent 721887edc0
commit a392056e86
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/desktops/lomiri/development/qtmir/default.nix
+18 -13
View File
@@ -50,19 +50,24 @@ stdenv.mkDerivation (finalAttrs: {
"dev"
];
postPatch = ''
# 10s timeout for Mir startup is too tight for VM tests on weaker hardwre (aarch64)
substituteInPlace src/platforms/mirserver/qmirserver_p.cpp \
--replace-fail 'const int timeout = RUNNING_ON_VALGRIND ? 100 : 10' 'const int timeout = RUNNING_ON_VALGRIND ? 900 : 90' \
--replace-fail 'const int timeout = 10' 'const int timeout = 90'
substituteInPlace CMakeLists.txt \
--replace-fail "\''${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" \
--replace-fail "\''${CMAKE_INSTALL_FULL_LIBDIR}/qt5/plugins/platforms" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtPluginPrefix}/platforms" \
substituteInPlace data/xwayland.qtmir.desktop \
--replace-fail '/usr/bin/Xwayland' 'Xwayland'
'';
postPatch =
# 10s timeout for Mir startup is too tight for VM tests on weaker hardware (aarch64)
''
substituteInPlace src/platforms/mirserver/qmirserver_p.cpp \
--replace-fail 'const int timeout = RUNNING_ON_VALGRIND ? 100 : 10' 'const int timeout = RUNNING_ON_VALGRIND ? 900 : 90' \
--replace-fail 'const int timeout = 10' 'const int timeout = 90'
''
# Fix where Qt plugins & QML modules should be installed to. We don't use "qt5" for Qt5.
+ ''
substituteInPlace CMakeLists.txt \
--replace-fail "\''${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" \
--replace-fail "\''${CMAKE_INSTALL_FULL_LIBDIR}/qt5/plugins/platforms" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtPluginPrefix}/platforms"
''
# Look up Xwayland in environment
+ ''
substituteInPlace data/xwayland.qtmir.desktop \
--replace-fail '/usr/bin/Xwayland' 'Xwayland'
'';
strictDeps = true;