From 3ef60ac4998d1e24b4c11230cdfba361af9c0130 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 27 May 2024 17:08:53 +0200 Subject: [PATCH 1/2] lomiri.telephony-service: Mark broken & exclude everywhere Needs a GLib change to be fixed, which needs a staging cycle, which I was told won't happen in time anymore. Luckily it's not a crucial component for the desktop mode. --- nixos/modules/services/desktop-managers/lomiri.nix | 4 ++-- nixos/tests/ayatana-indicators.nix | 2 +- pkgs/desktops/lomiri/applications/lomiri/default.nix | 2 +- pkgs/desktops/lomiri/services/telephony-service/default.nix | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 06930b15a008..214ec17e0dc4 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -34,7 +34,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 + # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043 ]); }; @@ -79,7 +79,7 @@ in { ] ++ lib.optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [ ayatana-indicator-sound ]) ++ (with pkgs.lomiri; [ - telephony-service + # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043 ] ++ lib.optionals config.networking.networkmanager.enable [ lomiri-indicator-network ]); diff --git a/nixos/tests/ayatana-indicators.nix b/nixos/tests/ayatana-indicators.nix index cfd4d8099d11..ccb1e059a697 100644 --- a/nixos/tests/ayatana-indicators.nix +++ b/nixos/tests/ayatana-indicators.nix @@ -35,7 +35,7 @@ in { ayatana-indicator-sound ] ++ (with pkgs.lomiri; [ lomiri-indicator-network - telephony-service + # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043 ]); }; diff --git a/pkgs/desktops/lomiri/applications/lomiri/default.nix b/pkgs/desktops/lomiri/applications/lomiri/default.nix index f9eead00dafb..35fdd1e46617 100644 --- a/pkgs/desktops/lomiri/applications/lomiri/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri/default.nix @@ -207,7 +207,7 @@ stdenv.mkDerivation (finalAttrs: { lomiri-settings-components lomiri-thumbnailer qtmultimedia - telephony-service + # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043 ]; nativeCheckInputs = [ diff --git a/pkgs/desktops/lomiri/services/telephony-service/default.nix b/pkgs/desktops/lomiri/services/telephony-service/default.nix index 975f96bce992..f07d8b2baa99 100644 --- a/pkgs/desktops/lomiri/services/telephony-service/default.nix +++ b/pkgs/desktops/lomiri/services/telephony-service/default.nix @@ -197,5 +197,7 @@ 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; }; }) From 137015743e41f96035b33989bf8cf2793aaa0c72 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 27 May 2024 17:12:45 +0200 Subject: [PATCH 2/2] lomiri.lomiri-indicator-network: Disable tests Needs a GLib change to be fixed, which needs a staging cycle, which I was told won't happen in time anymore. Seems like only the tests fail though. --- .../lomiri/services/lomiri-indicator-network/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix index fc552881f469..6566ec4601d3 100644 --- a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix @@ -101,7 +101,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_DOC" true) # lacks QML docs, needs qdoc: https://github.com/NixOS/nixpkgs/pull/245379 ]; - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + # Currently broken: https://github.com/NixOS/nixpkgs/pull/314043 + doCheck = false; postInstall = '' substituteInPlace $out/etc/dbus-1/services/com.lomiri.connectivity1.service \