jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lomiri.lomiri-ui-extras: 0.6.2 -> 0.6.3

Browse Source
This commit is contained in:
OPNA2608 2024-01-28 17:18:45 +01:00
parent 0f37382b13
commit c11c804379
1 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitLab
, fetchpatch
, gitUpdater
, cmake
, cmake-extras
@ -17,48 +16,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-ui-extras";
version = "0.6.2";
version = "0.6.3";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-ui-extras";
rev = finalAttrs.version;
hash = "sha256-RZTGTe18ebqKz8kWOpRgFJO2sR97sVbdPQMW/XLHs68=";
hash = "sha256-SF/UF84K9kNtLHO9FDuIFdQId0NfbmRiRZiPrOKvE9o=";
};
patches = [
# Fix compatibility with Exiv2 0.28.0
# Remove when version > 0.6.2
(fetchpatch {
name = "0001-lomiri-ui-extras-Fix-for-exiv2-0.28.0.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-ui-extras/-/commit/f337ceefa7c4f8f39dc7c75d51df8b86f148891a.patch";
hash = "sha256-dm50un46eTeBZsyHJF1npGBqOAF1BopJZ1Uln1PqSOE=";
})
# Remove deprecated qt5_use_modules usage
# Remove when version > 0.6.2
(fetchpatch {
name = "0002-lomiri-ui-extras-Stop-using-qt5_use_modules.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-ui-extras/-/commit/df506e7ebe7107dd0465d7d65727753f07abd122.patch";
hash = "sha256-VmOhJaUgjp9BHoYAO780uxI5tE7F0Gtp9gRNe0QCrhs=";
})
# Find qmltestrunner via PATH instead of hardcoded path
# https://gitlab.com/ubports/development/core/lomiri-ui-extras/-/merge_requests/84
(fetchpatch {
name = "0003-lomiri-ui-extras-Dont-insist-on-finding-qmltestrunner-only-at-hardcoded-guess.patch";
url = "https://gitlab.com/OPNA2608/lomiri-ui-extras/-/commit/b0c4901818761b516a45b7f0524ac713ddf33cfe.patch";
hash = "sha256-oFeaGiYEDr9XHRlCpXX+0ALlVdfb0FmGBFF1RzIXSBE=";
})
];
postPatch = ''
substituteInPlace modules/Lomiri/Components/Extras{,/{plugin,PamAuthentication}}/CMakeLists.txt \
--replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
# tst_busy_indicator runs into a codepath in lomiri-ui-toolkit that expects a working GL context
sed -i tests/qml/CMakeLists.txt \
-e '/declare_qml_test("tst_busy_indicator"/d'
'';
strictDeps = true;
@ -89,11 +58,19 @@ stdenv.mkDerivation (finalAttrs: {
dontWrapQtApps = true;
cmakeFlags = [
"-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}"
(lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
(lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (lib.concatStringsSep ";" [
# Exclude tests
"-E" (lib.strings.escapeShellArg "(${lib.concatStringsSep "|" [
# tst_busy_indicator runs into a codepath in lomiri-ui-toolkit that expects a working GL context
"^tst_busy_indicator"
# Photo & PhotoImageProvider Randomly fail, unsure why
"^tst_PhotoEditorPhoto"
]})")
]))
];
# tst_PhotoEditorPhoto and tst_PhotoEditorPhotoImageProvider randomly fail, haven't had time to debug
doCheck = false;
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
# Parallelism breaks xvfb-run-launched script for QML tests
enableParallelChecking = false;
@ -118,6 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
documentation and/or lack of automated tests.
'';
homepage = "https://gitlab.com/ubports/development/core/lomiri-ui-extras";
changelog = "https://gitlab.com/ubports/development/core/lomiri-ui-extras/-/blob/${finalAttrs.version}/ChangeLog";
license = licenses.gpl3Only;
maintainers = teams.lomiri.members;
platforms = platforms.linux;