diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index 2b2d4cd6a6ea..f008c66c4332 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -53,6 +53,7 @@ let # Check for working qdoc: not found withDocumentation = !useQt6; }; + lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { }; } // lib.optionalAttrs (!useQt6) { #### Core Apps @@ -96,7 +97,6 @@ let lomiri-polkit-agent = callPackage ./services/lomiri-polkit-agent { }; lomiri-telephony-service = callPackage ./services/lomiri-telephony-service { }; lomiri-thumbnailer = callPackage ./services/lomiri-thumbnailer { }; - lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { }; mediascanner2 = callPackage ./services/mediascanner2 { }; }; in diff --git a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix index d28de698e310..d9a7435ec4ee 100644 --- a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix @@ -28,6 +28,9 @@ wrapQtAppsHook, }: +let + withQt6 = lib.strings.versionAtLeast qtbase.version "6"; +in stdenv.mkDerivation (finalAttrs: { pname = "lomiri-url-dispatcher"; version = "0.1.4"; @@ -93,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: { libapparmor lomiri-app-launch lomiri-ui-toolkit - qtdeclarative sqlite systemd libxkbcommon @@ -128,13 +130,19 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram $out/bin/lomiri-url-dispatcher-dump \ --prefix PATH : ${lib.makeBinPath [ sqlite ]} - + '' + # https://gitlab.com/ubports/development/core/lomiri-url-dispatcher/-/work_items/13 + + lib.optionalString withQt6 '' + rm $out/bin/lomiri-url-dispatcher-gui + rm -r $out/share/lomiri-url-dispatcher/gui + '' + + lib.optionalString (!withQt6) '' mkdir -p $out/share/icons/hicolor/scalable/apps ln -s $out/share/lomiri-url-dispatcher/gui/lomiri-url-dispatcher-gui.svg $out/share/icons/hicolor/scalable/apps/ # Calls qmlscene from PATH, needs Qt plugins & QML components qtWrapperArgs+=( - --prefix PATH : ${lib.makeBinPath [ qtdeclarative.dev ]} + --prefix PATH : ${lib.makeBinPath [ (if withQt6 then qtdeclarative.out else qtdeclarative.dev) ]} ) wrapQtApp $out/bin/lomiri-url-dispatcher-gui '';