lomiri.lomiri-ui-toolkit: nixfmt, modernise

This commit is contained in:
OPNA2608 2024-10-31 13:53:55 +01:00
parent ba59f61a72
commit 5cc3c54a64

View File

@ -1,37 +1,46 @@
{ stdenv {
, lib stdenv,
, fetchFromGitLab lib,
, gitUpdater fetchFromGitLab,
, substituteAll gitUpdater,
, testers substituteAll,
, dbus-test-runner testers,
, dpkg dbus-test-runner,
, gdb dpkg,
, glib gdb,
, lttng-ust glib,
, perl lttng-ust,
, pkg-config perl,
, python3 pkg-config,
, qmake python3,
, qtbase qmake,
, qtdeclarative qtbase,
, qtfeedback qtdeclarative,
, qtgraphicaleffects qtfeedback,
, qtpim qtgraphicaleffects,
, qtquickcontrols2 qtpim,
, qtsvg qtquickcontrols2,
, qtsystems qtsvg,
, qttools qtsystems,
, suru-icon-theme qttools,
, validatePkgConfig suru-icon-theme,
, wrapQtAppsHook validatePkgConfig,
, xvfb-run wrapQtAppsHook,
xvfb-run,
}: }:
let let
listToQtVar = suffix: lib.makeSearchPathOutput "bin" suffix; listToQtVar = suffix: lib.makeSearchPathOutput "bin" suffix;
qtPluginPaths = listToQtVar qtbase.qtPluginPrefix [ qtbase qtpim qtsvg ]; qtPluginPaths = listToQtVar qtbase.qtPluginPrefix [
qtQmlPaths = listToQtVar qtbase.qtQmlPrefix [ qtdeclarative qtfeedback qtgraphicaleffects ]; qtbase
qtpim
qtsvg
];
qtQmlPaths = listToQtVar qtbase.qtQmlPrefix [
qtdeclarative
qtfeedback
qtgraphicaleffects
];
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-ui-toolkit"; pname = "lomiri-ui-toolkit";
@ -44,10 +53,15 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-r+wUCl+ywFcgFYo7BjBoXiulQptd1Zd3LJchXiMtx4I="; hash = "sha256-r+wUCl+ywFcgFYo7BjBoXiulQptd1Zd3LJchXiMtx4I=";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [
"out"
"dev"
"doc"
];
patches = [ patches = [
./2001-Mark-problematic-tests.patch ./2001-Mark-problematic-tests.patch
(substituteAll { (substituteAll {
src = ./2002-Nixpkgs-versioned-QML-path.patch.in; src = ./2002-Nixpkgs-versioned-QML-path.patch.in;
name = "2002-Nixpkgs-versioned-QML-path.patch"; name = "2002-Nixpkgs-versioned-QML-path.patch";
@ -205,7 +219,7 @@ stdenv.mkDerivation (finalAttrs: {
updateScript = gitUpdater { }; updateScript = gitUpdater { };
}; };
meta = with lib; { meta = {
description = "QML components to ease the creation of beautiful applications in QML"; description = "QML components to ease the creation of beautiful applications in QML";
longDescription = '' longDescription = ''
This project consists of a set of QML components to ease the creation of beautiful applications in QML for Lomiri. This project consists of a set of QML components to ease the creation of beautiful applications in QML for Lomiri.
@ -223,9 +237,12 @@ stdenv.mkDerivation (finalAttrs: {
''; '';
homepage = "https://gitlab.com/ubports/development/core/lomiri-ui-toolkit"; homepage = "https://gitlab.com/ubports/development/core/lomiri-ui-toolkit";
changelog = "https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/blob/${finalAttrs.version}/ChangeLog"; changelog = "https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/blob/${finalAttrs.version}/ChangeLog";
license = with licenses; [ gpl3Only cc-by-sa-30 ]; license = with lib.licenses; [
maintainers = teams.lomiri.members; gpl3Only
platforms = platforms.linux; cc-by-sa-30
];
maintainers = lib.teams.lomiri.members;
platforms = lib.platforms.linux;
pkgConfigModules = [ pkgConfigModules = [
"LomiriGestures" "LomiriGestures"
"LomiriMetrics" "LomiriMetrics"