From 4ce2e1df58eca6a7e0358a8efc5b0ebb4373760c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 31 Oct 2024 13:58:46 +0100 Subject: [PATCH] lomiri.lomiri-download-manager: nixfmt, modernise --- .../lomiri-download-manager/default.nix | 95 +++++++++---------- 1 file changed, 45 insertions(+), 50 deletions(-) diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix index b666b37d1e29..acd5647a625d 100644 --- a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix @@ -1,28 +1,29 @@ -{ stdenv -, lib -, fetchFromGitLab -, fetchpatch -, gitUpdater -, testers -, boost -, cmake -, cmake-extras -, dbus -, dbus-test-runner -, withDocumentation ? true -, doxygen -, glog -, graphviz -, gtest -, lomiri-api -, pkg-config -, python3 -, qtbase -, qtdeclarative -, qttools -, validatePkgConfig -, wrapQtAppsHook -, xvfb-run +{ + stdenv, + lib, + fetchFromGitLab, + fetchpatch, + gitUpdater, + testers, + boost, + cmake, + cmake-extras, + dbus, + dbus-test-runner, + withDocumentation ? true, + doxygen, + glog, + graphviz, + gtest, + lomiri-api, + pkg-config, + python3, + qtbase, + qtdeclarative, + qttools, + validatePkgConfig, + wrapQtAppsHook, + xvfb-run, }: stdenv.mkDerivation (finalAttrs: { @@ -39,9 +40,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" - ] ++ lib.optionals withDocumentation [ - "doc" - ]; + ] ++ lib.optionals withDocumentation [ "doc" ]; patches = [ # This change seems incomplete, potentially breaks things on systems that don't use AppArmor mediation @@ -69,16 +68,18 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ - cmake - pkg-config - validatePkgConfig - wrapQtAppsHook - ] ++ lib.optionals withDocumentation [ - doxygen - graphviz - qttools # qdoc - ]; + nativeBuildInputs = + [ + cmake + pkg-config + validatePkgConfig + wrapQtAppsHook + ] + ++ lib.optionals withDocumentation [ + doxygen + graphviz + qttools # qdoc + ]; buildInputs = [ boost @@ -96,9 +97,7 @@ stdenv.mkDerivation (finalAttrs: { xvfb-run ]; - checkInputs = [ - gtest - ]; + checkInputs = [ gtest ]; cmakeFlags = [ (lib.cmakeBool "ENABLE_DOC" withDocumentation) @@ -107,11 +106,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_WERROR" false) ]; - makeTargets = [ - "all" - ] ++ lib.optionals withDocumentation [ - "doc" - ]; + makeTargets = [ "all" ] ++ lib.optionals withDocumentation [ "doc" ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; @@ -128,13 +123,13 @@ stdenv.mkDerivation (finalAttrs: { updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Performs uploads and downloads from a centralized location"; homepage = "https://gitlab.com/ubports/development/core/lomiri-download-manager"; changelog = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/blob/${finalAttrs.version}/ChangeLog"; - license = licenses.lgpl3Only; - maintainers = teams.lomiri.members; - platforms = platforms.linux; + license = lib.licenses.lgpl3Only; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; pkgConfigModules = [ "ldm-common" "lomiri-download-manager-client"