diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index 693fa37f758b..73a1559fbf32 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -25,6 +25,7 @@ let #### Development tools / libraries cmake-extras = callPackage ./development/cmake-extras { }; deviceinfo = callPackage ./development/deviceinfo { }; + lomiri-api = callPackage ./development/lomiri-api { }; #### QML / QML-related lomiri-ui-extras = callPackage ./qml/lomiri-ui-extras { }; @@ -56,7 +57,6 @@ let gmenuharness = callPackage ./development/gmenuharness { }; gsettings-qt = callPackage ./development/gsettings-qt { }; libusermetrics = callPackage ./development/libusermetrics { }; - lomiri-api = callPackage ./development/lomiri-api { }; lomiri-app-launch = callPackage ./development/lomiri-app-launch { }; qtmir = callPackage ./development/qtmir { }; trust-store = callPackage ./development/trust-store { }; diff --git a/pkgs/desktops/lomiri/development/lomiri-api/default.nix b/pkgs/desktops/lomiri/development/lomiri-api/default.nix index 903e8da48645..3fa57e8c820c 100644 --- a/pkgs/desktops/lomiri/development/lomiri-api/default.nix +++ b/pkgs/desktops/lomiri/development/lomiri-api/default.nix @@ -17,8 +17,12 @@ python3, qtbase, qtdeclarative, + withDocumentation ? true, }: +let + withQt6 = lib.strings.versionAtLeast qtbase.version "6"; +in stdenv.mkDerivation (finalAttrs: { pname = "lomiri-api"; version = "0.3.0"; @@ -33,6 +37,8 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" + ] + ++ lib.optionals withDocumentation [ "doc" ]; @@ -53,10 +59,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - doxygen - graphviz pkg-config qtdeclarative + ] + ++ lib.optionals withDocumentation [ + doxygen + graphviz ]; buildInputs = [ @@ -76,7 +84,8 @@ stdenv.mkDerivation (finalAttrs: { dontWrapQtApps = true; cmakeFlags = [ - (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6")) + (lib.cmakeBool "ENABLE_QT6" withQt6) + (lib.cmakeBool "NO_TESTS" (!finalAttrs.finalPackage.doCheck)) ]; env.FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; @@ -95,7 +104,10 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + # https://gitlab.com/ubports/development/core/lomiri-api/-/issues/5 + tests = lib.optionalAttrs (!withQt6) { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; updateScript = gitUpdater { }; }; @@ -113,10 +125,10 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.linux; pkgConfigModules = [ "liblomiri-api" - "lomiri-shell-api" - "lomiri-shell-application" - "lomiri-shell-launcher" - "lomiri-shell-notifications" + "lomiri-shell-api${lib.optionalString withQt6 "-qt6"}" + "lomiri-shell-application${lib.optionalString withQt6 "-qt6"}" + "lomiri-shell-launcher${lib.optionalString withQt6 "-qt6"}" + "lomiri-shell-notifications${lib.optionalString withQt6 "-qt6"}" ]; }; })