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 #315117 from OPNA2608/fix/lomiri-24.05-buildable

Browse source 
lomiri.*: Make buildable while waiting for GLib fix
This commit is contained in:
Cosima Neidahl 2024-05-29 08:43:42 +02:00 • committed by GitHub
commit 33ce263359
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,7 +34,7 @@ in {
morph-browser morph-browser
qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session
suru-icon-theme 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) [ ] ++ lib.optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [
ayatana-indicator-sound ayatana-indicator-sound
]) ++ (with pkgs.lomiri; [ ]) ++ (with pkgs.lomiri; [
telephony-service # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043
] ++ lib.optionals config.networking.networkmanager.enable [ ] ++ lib.optionals config.networking.networkmanager.enable [
lomiri-indicator-network lomiri-indicator-network
]); ]);

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

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

2
pkgs/desktops/lomiri/applications/lomiri/default.nix
View file

@ -207,7 +207,7 @@ stdenv.mkDerivation (finalAttrs: {
lomiri-settings-components lomiri-settings-components
lomiri-thumbnailer lomiri-thumbnailer
qtmultimedia qtmultimedia
telephony-service # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043
]; ];
nativeCheckInputs = [ nativeCheckInputs = [

3
pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix
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 (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 = '' postInstall = ''
substituteInPlace $out/etc/dbus-1/services/com.lomiri.connectivity1.service \ substituteInPlace $out/etc/dbus-1/services/com.lomiri.connectivity1.service \

2
pkgs/desktops/lomiri/services/telephony-service/default.nix
View file

@ -197,5 +197,7 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = teams.lomiri.members; maintainers = teams.lomiri.members;
platforms = platforms.linux; platforms = platforms.linux;
# Completely broken until https://github.com/NixOS/nixpkgs/pull/314043 is merged
broken = true;
}; };
}) })