c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

libsForQt5.qmenumodel: 0.9.2 -> 0.10.0, qt6Packages.qmenumodel: init at 0.10.0 (#532162)

Browse source
This commit is contained in:
Cosima Neidahl 2026-06-21 18:40:58 +00:00 • committed by GitHub
commit 58955d2a8c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
pkgs/development/libraries/qmenumodel/default.nix
View file

@ -16,15 +16,18 @@
gobject-introspection,
}:
let
withQt6 = lib.versions.major qtbase.version == "6";
in
stdenv.mkDerivation (finalAttrs: {
pname = "qmenumodel";
version = "0.9.2";
version = "0.10.0";
src = fetchFromGitHub {
owner = "AyatanaIndicators";
repo = "qmenumodel";
rev = finalAttrs.version;
hash = "sha256-zbKAfq9R5fD2IqVYOAhy903QX1TDom9m6Ib2qpkFMak=";
hash = "sha256-f8JUMYzPCiCF5Vnw2xrgwZJNhksO3noQcGp3YFhS5lE=";
};
outputs = [
@ -34,11 +37,11 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace libqmenumodel/src/qmenumodel.pc.in \
--replace "\''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@" "\''${prefix}/lib" \
--replace "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" "\''${prefix}/include"
--replace-fail "\''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@" "\''${prefix}/lib" \
--replace-fail "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" "\''${prefix}/include"
substituteInPlace libqmenumodel/QMenuModel/CMakeLists.txt \
--replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
--replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
''
+ lib.optionalString finalAttrs.finalPackage.doCheck ''
patchShebangs tests/{client,script}/*.py
@ -73,7 +76,8 @@ stdenv.mkDerivation (finalAttrs: {
dontWrapQtApps = true;
cmakeFlags = [
"-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}"
(lib.strings.cmakeBool "ENABLE_QT6" withQt6)
(lib.strings.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
];
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
@ -92,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
};
meta = {
description = "Qt5 renderer for Ayatana Indicators";
description = "Qt renderer for Ayatana Indicators";
longDescription = ''
QMenuModel - a Qt/QML binding for GMenuModel
(see http://developer.gnome.org/gio/unstable/GMenuModel.html)
@ -102,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
teams = [ lib.teams.lomiri ];
platforms = lib.platforms.linux;
pkgConfigModules = [
"qmenumodel"
"qmenumodel${lib.optionalString withQt6 "-qt6"}"
];
};
})

4
pkgs/top-level/qt6-packages.nix
View file

@ -101,6 +101,10 @@ makeScopeWithSplicing' {
qmlbox2d = callPackage ../development/libraries/qmlbox2d { };
packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { };
qmenumodel = callPackage ../development/libraries/qmenumodel {
inherit (pkgs.lomiri-qt6) cmake-extras;
};
qodeassist-plugin = callPackage ../development/libraries/qodeassist-plugin { };
qt6ct = callPackage ../tools/misc/qt6ct { };