diff options
| author | Cosima Neidahl <opna2608@protonmail.com> | 2024-02-06 22:08:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-06 22:08:37 +0100 |
| commit | 5db4e5365627cf610074dcc418c6a7dee75a701e (patch) | |
| tree | f22aaa701993f9fbd1ce6eb521b0b5c2df3b2c56 /pkgs/desktops | |
| parent | d2ac2f173bdd3e6b0cadc9b6f1a1a15110abd5b6 (diff) | |
| parent | e2eab5dbd8b39c9cc554a1dd26b57e97a9f644ba (diff) | |
| download | nixlib-5db4e5365627cf610074dcc418c6a7dee75a701e.tar nixlib-5db4e5365627cf610074dcc418c6a7dee75a701e.tar.gz nixlib-5db4e5365627cf610074dcc418c6a7dee75a701e.tar.bz2 nixlib-5db4e5365627cf610074dcc418c6a7dee75a701e.tar.lz nixlib-5db4e5365627cf610074dcc418c6a7dee75a701e.tar.xz nixlib-5db4e5365627cf610074dcc418c6a7dee75a701e.tar.zst nixlib-5db4e5365627cf610074dcc418c6a7dee75a701e.zip | |
Merge pull request #286133 from OPNA2608/fix/lomiri-app-launch_flakiness
lomiri.lomiri-app-launch: Fix flakiness
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix b/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix index e8e0a35c8809..381a89fe10ff 100644 --- a/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix +++ b/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitLab +, fetchpatch , gitUpdater , testers , cmake @@ -46,6 +47,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-vuu6tZ5eDJN2rraOpmrDddSl1cIFFBSrILKMJqcUDVc="; }; + patches = [ + # Remove when https://gitlab.com/ubports/development/core/lomiri-app-launch/-/merge_requests/57 merged & in release + (fetchpatch { + name = "0001-lomiri-app-launch-Fix-typelib-gir-dependency.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-app-launch/-/commit/0419b2592284f43ee5e76060948ea3d5f1c991fd.patch"; + hash = "sha256-11pEhFi39Cvqb9Hg47kT8+5hq+bz6WmySqaIdwt1MVk="; + }) + ]; + postPatch = '' patchShebangs tests/{desktop-hook-test.sh.in,repeat-until-pass.sh} @@ -100,6 +110,14 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "ENABLE_MIRCLIENT" false) (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (lib.concatStringsSep ";" [ + # Exclude tests + "-E" (lib.strings.escapeShellArg "(${lib.concatStringsSep "|" [ + # Flaky, randomly hangs + # https://gitlab.com/ubports/development/core/lomiri-app-launch/-/issues/19 + "^helper-handshake-test" + ]})") + ])) ]; postBuild = lib.optionalString withDocumentation '' |