Merge pull request #315535 from NixOS/backport-315117-to-release-24.05

[Backport release-24.05] lomiri.*: Make buildable while waiting for GLib fix
This commit is contained in:
Cosima Neidahl
2024-05-29 14:36:47 +02:00
committed by GitHub
5 changed files with 8 additions and 5 deletions

View File

@@ -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
]);
};
@@ -75,7 +75,7 @@ in {
ayatana-indicator-power
ayatana-indicator-session
]) ++ (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
]);

View File

@@ -33,7 +33,7 @@ in {
ayatana-indicator-session
] ++ (with pkgs.lomiri; [
lomiri-indicator-network
telephony-service
# telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043
]);
};

View File

@@ -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 = [

View File

@@ -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 \

View File

@@ -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;
};
})