lol

lomiri.lomiri-content-hub: 2.0.0 -> 2.1.0 (#407613)

authored by

Cosima Neidahl and committed by
GitHub
f86f81ef 3da27131

+21 -4
+21 -4
pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
··· 2 2 stdenv, 3 3 lib, 4 4 fetchFromGitLab, 5 + fetchpatch, 5 6 gitUpdater, 7 + nixosTests, 6 8 testers, 7 9 cmake, 8 10 cmake-extras, ··· 31 33 32 34 stdenv.mkDerivation (finalAttrs: { 33 35 pname = "lomiri-content-hub"; 34 - version = "2.0.0"; 36 + version = "2.1.0"; 35 37 36 38 src = fetchFromGitLab { 37 39 owner = "ubports"; 38 40 repo = "development/core/lomiri-content-hub"; 39 41 rev = finalAttrs.version; 40 - hash = "sha256-eA5oCoAZB7fWyWm0Sy6wXh0EW+h76bdfJ2dotr7gUC0="; 42 + hash = "sha256-S/idjDdcRvqZqKmflkYJyQckz4/9k/8JY6eRDACk9Ag="; 41 43 }; 42 44 43 45 outputs = [ ··· 47 49 "examples" 48 50 ]; 49 51 52 + patches = [ 53 + # Remove when version > 2.1.0 54 + (fetchpatch { 55 + name = "0001-lomiri-content-hub-treewide-Add-missing-LDM-include-dirs.patch"; 56 + url = "https://gitlab.com/ubports/development/core/lomiri-content-hub/-/commit/cdd3371714c183d4caf166157082288c022bb98d.patch"; 57 + hash = "sha256-Uubd425T+0KxPR9lJW6+ejO2fFzcDwEIpJATSZ9jYD4="; 58 + }) 59 + ]; 60 + 50 61 postPatch = '' 51 62 substituteInPlace import/*/Content/CMakeLists.txt \ 52 - --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" 63 + --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" 53 64 54 65 # Look for peer files in running system 55 66 substituteInPlace src/com/lomiri/content/service/registry-updater.cpp \ ··· 101 112 cmakeFlags = [ 102 113 (lib.cmakeBool "GSETTINGS_COMPILE" true) 103 114 (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true) 115 + (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6")) 104 116 (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) 105 117 (lib.cmakeBool "ENABLE_DOC" true) 106 118 (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" true) # in case something still depends on it ··· 145 157 ''; 146 158 147 159 passthru = { 148 - tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 160 + tests = { 161 + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 162 + # Tests content-hub functionality, up to the point where one app receives a content exchange request 163 + # from another and changes into a mode to pick the content to send 164 + vm = nixosTests.lomiri.desktop-appinteractions; 165 + }; 149 166 updateScript = gitUpdater { }; 150 167 }; 151 168