Skip to content

osgqt: add Qt6 support #437594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nim65s wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

osgqt: add Qt6 support #437594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 31 additions & 4 deletions pkgs/by-name/os/osgqt/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
{
cmake,
fetchFromGitHub,
fetchpatch,
lib,
libsForQt5,
qt6Packages,
openscenegraph,
stdenv,
}:

qt6Support ? false,
}:
let
qt = if qt6Support then qt6Packages else libsForQt5;
in
stdenv.mkDerivation (finalAttrs: {
pname = "osgQt";
version = "3.5.7-unstable-2025-10-08";
Expand All @@ -18,17 +24,38 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-+rjy2a266p755Mbfk6jRApiERpOL8axHklK0cYokX40=";
};

buildInputs = [ libsForQt5.qtbase ];
patches = lib.optionals qt6Support [
(fetchpatch {
url = "https://github.com/DeadParrot/osgQt/commit/c4d48d1f05fda1dcb210418b89c75edf2157d85b.patch";
hash = "sha256-oq6R7BwXagXhxz3ClkD4qVSaNyfKawU5JK4Pq3QBKvU=";
})
(fetchpatch {
url = "https://github.com/DeadParrot/osgQt/commit/acbcdbec0026ad4b3979b6fa9311a1576f06b2cc.patch";
hash = "sha256-OJSITx/Lr4DwWM9vrLUiKh/cXZW+3jSAyNXLeyHPm3k=";
})
];

postPatch = lib.optionalString qt6Support ''
mv include/osgQOpenGL/GraphicsWindowEx{,.h}
mv include/osgQOpenGL/OSGRenderer{,.h}
mv include/osgQOpenGL/RenderStageEx{,.h}
mv include/osgQOpenGL/StateEx{,.h}
mv include/osgQOpenGL/osgQOpenGLWidget{,.h}
mv include/osgQOpenGL/osgQOpenGLWindow{,.h}
'';

buildInputs = [ qt.qtbase ];

nativeBuildInputs = [
cmake
libsForQt5.wrapQtAppsHook
qt.wrapQtAppsHook
];

propagatedBuildInputs = [ openscenegraph ];

cmakeFlags = [
"-DDESIRED_QT_VERSION=5"
"-DBUILD_OSG_EXAMPLES=OFF"
"-DDESIRED_QT_VERSION=${if qt6Support then "6" else "5"}"
"-DOpenGL_GL_PREFERENCE=GLVND"
];

Expand Down
2 changes: 2 additions & 0 deletions pkgs/top-level/qt5-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ makeScopeWithSplicing' {
qt = qt5;
};

osgqt = pkgs.osgqt.override { qt6Support = false; };

phonon = callPackage ../development/libraries/phonon { };

phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { };
Expand Down
2 changes: 2 additions & 0 deletions pkgs/top-level/qt6-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ makeScopeWithSplicing' {

maplibre-native-qt = callPackage ../development/libraries/maplibre-native-qt { };

osgqt = pkgs.osgqt.override { qt6Support = true; };

qca = callPackage ../development/libraries/qca {
inherit (qt6) qtbase qt5compat;
};
Expand Down
Loading