Unverified Commit c7ee7532 authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

Merge pull request #325247 from OPNA2608/fix/lomiri/revert-glib-workarounds 

lomiri.*: Revert GLib workarounds
parents 1c37dbac 8e3bb355

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

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ in { 
        morph-browser

        qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session

        suru-icon-theme

        # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043

        telephony-service

      ]);

      variables = {

        # To override the keyboard layouts in Lomiri
@@ -87,7 +87,7 @@ in { 
      ] ++ lib.optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [

        ayatana-indicator-sound

      ]) ++ (with pkgs.lomiri; [

        # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043

        telephony-service

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

        lomiri-indicator-network

      ]);

nixos/tests/ayatana-indicators.nix

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ in { 
        ayatana-indicator-sound

      ] ++ (with pkgs.lomiri; [

        lomiri-indicator-network

        # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043

        telephony-service

      ]);

    };

pkgs/desktops/lomiri/applications/lomiri/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ stdenv.mkDerivation (finalAttrs: { 
    lomiri-settings-components

    lomiri-thumbnailer

    qtmultimedia

    # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043

    telephony-service

  ];



  nativeCheckInputs = [

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

+1 −2
Original line number Diff line number Diff line
@@ -101,8 +101,7 @@ stdenv.mkDerivation (finalAttrs: { 
    (lib.cmakeBool "BUILD_DOC" true) # lacks QML docs, needs qdoc: https://github.com/NixOS/nixpkgs/pull/245379

  ];



  # Currently broken: https://github.com/NixOS/nixpkgs/pull/314043

  doCheck = false;

  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;



  postInstall = ''

    substituteInPlace $out/etc/dbus-1/services/com.lomiri.connectivity1.service \

pkgs/desktops/lomiri/services/telephony-service/default.nix

+9 −4
Original line number Diff line number Diff line
@@ -52,10 +52,17 @@ stdenv.mkDerivation (finalAttrs: { 
  patches = [

    # Remove when https://gitlab.com/ubports/development/core/telephony-service/-/merge_requests/90 merged & in release

    (fetchpatch {

      name = "0001-telephony-service-CMakeLists-Make-tests-optional.patch";

      url = "https://gitlab.com/ubports/development/core/telephony-service/-/commit/9a8297bcf9b34d77ffdae3dfe4ad2636022976fb.patch";

      name = "0001-lomiri-telephony-service-CMakeLists-Make-tests-optional.patch";

      url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/9a8297bcf9b34d77ffdae3dfe4ad2636022976fb.patch";

      hash = "sha256-Za4ZGKnw9iz2RP1LzLhKrEJ1vLUufWk8J07LmWDW40E=";

    })



    # Remove when version > 0.5.3

    (fetchpatch {

      name = "0002-lomiri-telephony-service-Fix-gettext-funcs-in-wrong-namespace.patch";

      url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/18e0ba8e025b097eef1217d97d98ef4a4940fe84.patch";

      hash = "sha256-vOIy+B/OQeccsVn4pXsnr8LYyEapqbebW1I6dBg5u2c=";

    })

  ];



  postPatch = ''
@@ -195,7 +202,5 @@ stdenv.mkDerivation (finalAttrs: { 
    license = licenses.gpl3Only;

    maintainers = teams.lomiri.members;

    platforms = platforms.linux;

    # Completely broken until https://github.com/NixOS/nixpkgs/pull/314043 is merged

    broken = true;

  };

})