diff options
Diffstat (limited to 'pkgs/desktops/lomiri/services/telephony-service/default.nix')
| -rw-r--r-- | pkgs/desktops/lomiri/services/telephony-service/default.nix | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/pkgs/desktops/lomiri/services/telephony-service/default.nix b/pkgs/desktops/lomiri/services/telephony-service/default.nix index 652958eeb87ff..6157322e7ea91 100644 --- a/pkgs/desktops/lomiri/services/telephony-service/default.nix +++ b/pkgs/desktops/lomiri/services/telephony-service/default.nix @@ -52,16 +52,25 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Remove when https://gitlab.com/ubports/development/core/telephony-service/-/merge_requests/90 merged & in release (fetchpatch { - name = "0001-telephony-service-CMakeLists-Make-tests-optional.patch"; - url = "https://gitlab.com/ubports/development/core/telephony-service/-/commit/9a8297bcf9b34d77ffdae3dfe4ad2636022976fb.patch"; + name = "0001-lomiri-telephony-service-CMakeLists-Make-tests-optional.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/9a8297bcf9b34d77ffdae3dfe4ad2636022976fb.patch"; 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 = '' # Queries qmake for the QML installation path, which returns a reference to Qt5's build directory + # Patch out failure if QMake is not found, since we don't use it substituteInPlace CMakeLists.txt \ - --replace "\''${QMAKE_EXECUTABLE} -query QT_INSTALL_QML" "echo $out/${qtbase.qtQmlPrefix}" + --replace "\''${QMAKE_EXECUTABLE} -query QT_INSTALL_QML" "echo $out/${qtbase.qtQmlPrefix}" \ + --replace-fail 'QMAKE_EXECUTABLE STREQUAL "QMAKE_EXECUTABLE-NOTFOUND"' 'FALSE' '' + lib.optionalString finalAttrs.finalPackage.doCheck '' substituteInPlace tests/common/dbus-services/CMakeLists.txt \ @@ -129,11 +138,16 @@ stdenv.mkDerivation (finalAttrs: { # Exclude tests "-E" (lib.strings.escapeShellArg "(${lib.concatStringsSep "|" [ # Flaky, randomly failing to launch properly & stuck until test timeout + # https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/issues/70 "^HandlerTest" "^OfonoAccountEntryTest" "^TelepathyHelperSetupTest" "^AuthHandlerTest" "^ChatManagerTest" + "^AccountEntryTest" + "^AccountEntryFactoryTest" + "^PresenceRequestTest" + "^CallEntryTest" ]})") ])) ]; @@ -195,7 +209,5 @@ 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; }; }) |