Unverified Commit 5448017c authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #304880 from OPNA2608/fix/lomiri/network-indicator-work 

lomiri.lomiri-network-indicator: Make it work, add it to Lomiri module
parents b9f2ef10 35614f61

nixos/modules/services/desktop-managers/lomiri.nix

+6 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ in { 
      ]);

    };



    networking.networkmanager.enable = lib.mkDefault true;



    systemd.packages = with pkgs.lomiri; [

      hfd-service

      lomiri-download-manager
@@ -73,6 +75,8 @@ in { 
        ayatana-indicator-session

      ]) ++ (with pkgs.lomiri; [

        telephony-service

      ] ++ lib.optionals config.networking.networkmanager.enable [

        lomiri-indicator-network

      ]);

    };
@@ -111,6 +115,8 @@ in { 
      "/share/lomiri-app-launch"

      # TODO Try to get maliit stuff working

      "/share/maliit/plugins"

      # At least the network indicator is still under the unity name, due to leftover Unity-isms

      "/share/unity"

      # Data

      "/share/locale" # TODO LUITK hardcoded default locale path, fix individual apps to not rely on it

      "/share/sounds"

nixos/tests/lomiri.nix

+15 −2
Original line number Diff line number Diff line
@@ -253,22 +253,35 @@ in { 
    with subtest("ayatana indicators work"):

        open_starter()

        machine.send_chars("Indicators\n")

        machine.wait_for_text(r"(Indicators|Client|List|datetime|session)")

        machine.wait_for_text(r"(Indicators|Client|List|network|datetime|session)")

        machine.screenshot("indicators_open")



        # Element tab order within the indicator menus is not fully deterministic

        # Only check that the indicators are listed & their items load



        with subtest("lomiri indicator network works"):

            # Select indicator-network

            machine.send_key("tab")

            # Don't go further down, first entry

            machine.send_key("ret")

            machine.wait_for_text(r"(Flight|Wi-Fi)")

            machine.screenshot("indicators_network")



        machine.send_key("shift-tab")

        machine.send_key("ret")

        machine.wait_for_text(r"(Indicators|Client|List|network|datetime|session)")



        with subtest("ayatana indicator datetime works"):

            # Select ayatana-indicator-datetime

            machine.send_key("tab")

            machine.send_key("down")

            machine.send_key("ret")

            machine.wait_for_text("Time and Date Settings")

            machine.screenshot("indicators_timedate")



        machine.send_key("shift-tab")

        machine.send_key("ret")

        machine.wait_for_text(r"(Indicators|Client|List|datetime|session)")

        machine.wait_for_text(r"(Indicators|Client|List|network|datetime|session)")



        with subtest("ayatana indicator session works"):

            # Select ayatana-indicator-session

pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix

+3 −4
Original line number Diff line number Diff line
@@ -47,11 +47,10 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  postPatch = ''

    # Queried via pkg-config, would need to override a prefix variable

    # Needs CMake 3.28 or higher to do as part of the call, https://github.com/NixOS/nixpkgs/pull/275284

    # Override original prefixes

    substituteInPlace data/CMakeLists.txt \

      --replace 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir)' 'set(DBUS_SESSION_BUS_SERVICES_DIR "''${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/services")' \

      --replace 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_DIR "''${CMAKE_INSTALL_PREFIX}/lib/systemd/user")'

      --replace-fail 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir)' 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir DEFINE_VARIABLES datadir=''${CMAKE_INSTALL_FULL_SYSCONFDIR})' \

      --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})'

  '';



  strictDeps = true;