Commit 708cb74f authored by OPNA2608's avatar OPNA2608
Browse files

lomiri-qt6.gmenuharness: init at 0.1.5

parent d97e6eb2

pkgs/desktops/lomiri/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ let 
      cmake-extras = callPackage ./development/cmake-extras { };

      deviceinfo = callPackage ./development/deviceinfo { };

      geonames = callPackage ./development/geonames { };

      gmenuharness = callPackage ./development/gmenuharness { };

      gsettings-qt = callPackage ./development/gsettings-qt { };

      lomiri-api = callPackage ./development/lomiri-api { };

      lomiri-app-launch = callPackage ./development/lomiri-app-launch { };
@@ -80,7 +81,6 @@ let 
      lomiri-session = callPackage ./data/lomiri-session { };



      #### Development tools / libraries

      gmenuharness = callPackage ./development/gmenuharness { };

      libusermetrics = callPackage ./development/libusermetrics { };

      qtmir = callPackage ./development/qtmir { };

      trust-store = callPackage ./development/trust-store { };

pkgs/desktops/lomiri/development/gmenuharness/default.nix

+8 −2
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 
  qtbase,

}:



let

  withQt6 = lib.strings.versionAtLeast qtbase.version "6";

in

stdenv.mkDerivation (finalAttrs: {

  pname = "gmenuharness";

  version = "0.1.5";
@@ -43,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: { 
    cmake-extras

    glib

    lomiri-api

    qtbase

  ];



  nativeCheckInputs = [
@@ -54,10 +56,14 @@ stdenv.mkDerivation (finalAttrs: { 
  checkInputs = [

    gtest

    libqtdbustest

    qtbase

  ];



  cmakeFlags = [

    "-Denable_tests=${lib.boolToString finalAttrs.finalPackage.doCheck}"

    (lib.strings.cmakeBool "enable_tests" finalAttrs.finalPackage.doCheck)

  ]

  ++ lib.optionals finalAttrs.finalPackage.doCheck [

    (lib.strings.cmakeBool "ENABLE_QT6" withQt6)

  ];



  dontWrapQtApps = true;