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

lomiri.lomiri-session: 0.3 -> 0.4

Browse Source
This commit is contained in:
OPNA2608
2026-07-13 23:42:46 +02:00
parent a8b81d3cc8
commit aeceb34b5c
2 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/desktops/lomiri/data/lomiri-session/1001-Unset-QT_QPA_PLATFORMTHEME.patch
+6 -6
View File
@@ -13,13 +13,13 @@ index 50dd4cb..ffc20c4 100755
--- a/lomiri-session.in
+++ b/lomiri-session.in
@@ -55,6 +55,7 @@ dbus-update-activation-environment --systemd MALIIT_FORCE_DBUS_CONNECTION=1
dbus-update-activation-environment --systemd QT_IM_MODULE=maliit
dbus-update-activation-environment --systemd GTK_IM_MODULE=maliit
dbus-update-activation-environment --systemd QT_QPA_PLATFORM=wayland
dbus-update-activation-environment --systemd QT_IM_MODULE="${QT_IM_MODULE}"
dbus-update-activation-environment --systemd GTK_IM_MODULE="${DEFAULT_GTK_IM_MODULE:-maliit}"
dbus-update-activation-environment --systemd QT_QPA_PLATFORM="${QT_QPA_PLATFORM}"
+dbus-update-activation-environment --systemd QT_QPA_PLATFORMTHEME=
dbus-update-activation-environment --systemd SDL_VIDEODRIVER=wayland
dbus-update-activation-environment --systemd QT_WAYLAND_DISABLE_WINDOWDECORATION=1
dbus-update-activation-environment --systemd QT_ACCESSIBILITY=1
dbus-update-activation-environment --systemd SDL_VIDEODRIVER="${DEFAULT_SDL_VIDEODRIVER:-wayland}"
dbus-update-activation-environment --systemd QT_WAYLAND_DISABLE_WINDOWDECORATION="${DEFAULT_QT_WAYLAND_DISABLE_WINDOWDECORATION:-1}"
dbus-update-activation-environment --systemd QT_ACCESSIBILITY="${DEFAULT_QT_ACCESSIBILITY:-1}"
--
2.44.1
pkgs/desktops/lomiri/data/lomiri-session/default.nix
+28 -5
View File
@@ -8,23 +8,26 @@
cmake,
dbus,
deviceinfo,
glib,
inotify-tools,
lomiri,
lomiri-schemas,
makeWrapper,
pkg-config,
systemd,
wrapGAppsHook4,
xdg-user-dirs,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "lomiri-session";
version = "0.3";
version = "0.4";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-session";
rev = finalAttrs.version;
hash = "sha256-XduE3tPUjw/wIjFCACasxtN33KO4bDLWrpl7pZcYaAA=";
hash = "sha256-zEH1VNBgOs9xP18toBc2VqMloDM6uL+tSIIEKZTHY0c=";
};
patches = [ ./1001-Unset-QT_QPA_PLATFORMTHEME.patch ];
@@ -41,10 +44,17 @@ stdenvNoCC.mkDerivation (finalAttrs: {
--replace-fail '@CMAKE_INSTALL_FULL_LIBEXECDIR@/lomiri-session/run-systemd-session' '${lib.getExe' xdg-user-dirs "xdg-user-dirs-update"} && @CMAKE_INSTALL_FULL_LIBEXECDIR@/lomiri-session/run-systemd-session'
'';
# Checks for run-time tools at configure-time
strictDeps = false;
__structuredAttrs = true;
nativeBuildInputs = [
cmake
glib # hook for wrapper arguments
makeWrapper
pkg-config
wrapGAppsHook4
];
buildInputs = [
@@ -53,9 +63,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
dbus
inotify-tools
lomiri
lomiri-schemas # for hook to pick up schemas
systemd
];
dontWrapGApps = true;
cmakeFlags = [
# Requires lomiri-system-compositor -> not ported to Mir 2.x yet
(lib.cmakeBool "ENABLE_TOUCH_SESSION" false)
@@ -63,14 +76,24 @@ stdenvNoCC.mkDerivation (finalAttrs: {
postInstall = ''
patchShebangs $out/bin/lomiri-session
wrapProgram $out/bin/lomiri-session \
'';
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : ${
lib.makeBinPath [
deviceinfo
deviceinfo # device-info
glib # gsettings
inotify-tools
lomiri
systemd # systemd-detect-virt
]
}
)
'';
postFixup = ''
wrapGApp $out/bin/lomiri-session
'';
passthru = {
@@ -79,7 +102,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
# not packaged/working yet
# "lomiri-touch"
];
tests.lomiri = nixosTests.lomiri;
tests = nixosTests.lomiri;
updateScript = gitUpdater { };
};