ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-05 20:19:16 +03:00
Code Issues Projects Releases Wiki 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
Show Stats 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 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 # currently broken: https://github.com/NixOS/nixpkgs/pull/314043 telephony-service
]); ]);
variables = { variables = {
# To override the keyboard layouts in Lomiri # To override the keyboard layouts in Lomiri
@ -87,7 +87,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 # currently broken: https://github.com/NixOS/nixpkgs/pull/314043 telephony-service
] ++ 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 # currently broken: https://github.com/NixOS/nixpkgs/pull/314043 telephony-service
]); ]);
}; };

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

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

3
pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix
View File

@ -101,8 +101,7 @@ 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
]; ];
# Currently broken: https://github.com/NixOS/nixpkgs/pull/314043 doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
doCheck = false;
postInstall = '' postInstall = ''
substituteInPlace $out/etc/dbus-1/services/com.lomiri.connectivity1.service \ substituteInPlace $out/etc/dbus-1/services/com.lomiri.connectivity1.service \

13
pkgs/desktops/lomiri/services/telephony-service/default.nix
View File

@ -52,10 +52,17 @@ stdenv.mkDerivation (finalAttrs: {
patches = [ patches = [
# Remove when https://gitlab.com/ubports/development/core/telephony-service/-/merge_requests/90 merged & in release # Remove when https://gitlab.com/ubports/development/core/telephony-service/-/merge_requests/90 merged & in release
(fetchpatch { (fetchpatch {
name = "0001-telephony-service-CMakeLists-Make-tests-optional.patch"; name = "0001-lomiri-telephony-service-CMakeLists-Make-tests-optional.patch";
url = "https://gitlab.com/ubports/development/core/telephony-service/-/commit/9a8297bcf9b34d77ffdae3dfe4ad2636022976fb.patch"; url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/9a8297bcf9b34d77ffdae3dfe4ad2636022976fb.patch";
hash = "sha256-Za4ZGKnw9iz2RP1LzLhKrEJ1vLUufWk8J07LmWDW40E="; hash = "sha256-Za4ZGKnw9iz2RP1LzLhKrEJ1vLUufWk8J07LmWDW40E=";
}) })
# Remove when version > 0.5.3
(fetchpatch {
name = "0002-lomiri-telephony-service-Fix-gettext-funcs-in-wrong-namespace.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/18e0ba8e025b097eef1217d97d98ef4a4940fe84.patch";
hash = "sha256-vOIy+B/OQeccsVn4pXsnr8LYyEapqbebW1I6dBg5u2c=";
})
]; ];
postPatch = '' postPatch = ''
@ -195,7 +202,5 @@ 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;
}; };
}) })