1818
1919stdenv . mkDerivation ( finalAttrs : {
2020 pname = "lomiri-ui-extras" ;
21- version = "0.6.3 " ;
21+ version = "0.7.0 " ;
2222
2323 src = fetchFromGitLab {
2424 owner = "ubports" ;
2525 repo = "development/core/lomiri-ui-extras" ;
26- rev = finalAttrs . version ;
27- hash = "sha256-SF/UF84K9kNtLHO9FDuIFdQId0NfbmRiRZiPrOKvE9o =" ;
26+ tag = finalAttrs . version ;
27+ hash = "sha256-fN9rZC8J8xyAStvBNTpLqAcssaiQQpu6INwMLlnkvfw =" ;
2828 } ;
2929
3030 postPatch = ''
3131 substituteInPlace modules/Lomiri/Components/Extras{,/{plugin,PamAuthentication}}/CMakeLists.txt \
32- --replace "\'' ${CMAKE_INSTALL_LIBDIR}/qt5 /qml" "\'' ${CMAKE_INSTALL_PREFIX}/${ qtbase . qtQmlPrefix } "
32+ --replace-fail "\'' ${CMAKE_INSTALL_LIBDIR}/qt\ '' ${QT_VERSION_MAJOR} /qml" "\'' ${CMAKE_INSTALL_PREFIX}/${ qtbase . qtQmlPrefix } "
3333 '' ;
3434
3535 strictDeps = true ;
@@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
6262
6363 cmakeFlags = [
6464 ( lib . cmakeBool "ENABLE_TESTS" finalAttrs . finalPackage . doCheck )
65+ ( lib . cmakeBool "ENABLE_QT6" ( lib . strings . versionAtLeast qtbase . version "6" ) )
6566 ( lib . cmakeFeature "CMAKE_CTEST_ARGUMENTS" (
6667 lib . concatStringsSep ";" [
6768 # Exclude tests
@@ -103,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
103104 updateScript = gitUpdater { } ;
104105 } ;
105106
106- meta = with lib ; {
107+ meta = {
107108 description = "Lomiri UI Extra Components" ;
108109 longDescription = ''
109110 A collection of UI components that for various reasons can't be included in
@@ -112,8 +113,8 @@ stdenv.mkDerivation (finalAttrs: {
112113 '' ;
113114 homepage = "https://gitlab.com/ubports/development/core/lomiri-ui-extras" ;
114115 changelog = "https://gitlab.com/ubports/development/core/lomiri-ui-extras/-/blob/${ finalAttrs . version } /ChangeLog" ;
115- license = licenses . gpl3Only ;
116- maintainers = teams . lomiri . members ;
117- platforms = platforms . linux ;
116+ license = lib . licenses . gpl3Only ;
117+ maintainers = lib . teams . lomiri . members ;
118+ platforms = lib . platforms . linux ;
118119 } ;
119120} )
0 commit comments