movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

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

Browse source 
lomiri.*: Revert GLib workarounds
This commit is contained in:
Franz Pletz 2024-07-09 17:51:49 +02:00 • committed by GitHub
commit c7ee75329f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/desktop-managers/lomiri.nix
View file

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

2
nixos/tests/ayatana-indicators.nix
View file

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