diff options
| author | Cosima Neidahl <opna2608@protonmail.com> | 2024-05-29 08:43:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-29 08:43:42 +0200 |
| commit | 33ce263359c13fb2282a954001c6285d3e3ed42c (patch) | |
| tree | f2d2e7f05ec87f5b98a0f80b171072959e5d79e9 /pkgs/desktops | |
| parent | 361afb9f34ecec1fea164bbfe8b097342f448922 (diff) | |
| parent | 137015743e41f96035b33989bf8cf2793aaa0c72 (diff) | |
Merge pull request #315117 from OPNA2608/fix/lomiri-24.05-buildable
lomiri.*: Make buildable while waiting for GLib fix
Diffstat (limited to 'pkgs/desktops')
3 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/desktops/lomiri/applications/lomiri/default.nix b/pkgs/desktops/lomiri/applications/lomiri/default.nix index f9eead00dafb9..35fdd1e466178 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/lomiri-indicator-network/default.nix b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix index fc552881f4696..6566ec4601d39 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 \ diff --git a/pkgs/desktops/lomiri/services/telephony-service/default.nix b/pkgs/desktops/lomiri/services/telephony-service/default.nix index 975f96bce9923..f07d8b2baa998 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; }; }) |