libqglviewer: fix on darwin + add to qt6Packages by nim65s · Pull Request #348549 · NixOS/nixpkgs

nim65s · 2024-10-14T15:02:18Z

Fix #348484, clean things a bit, and provide Qt6 version

Things done

Add a 👍 reaction to pull requests you find important.

nim65s · 2024-10-14T19:06:35Z

Tested GUI on https://github.com/sofa-framework/sofa/, linux & darwin: snake simulation runs fine.

This require fixes in upstream nixpkgs: NixOS/nixpkgs#348549 So we can use the source of that PR for now

nim65s · 2024-12-02T11:53:37Z

Hi @NixOS/darwin-core,
Could someone check this PR ?
I know nothing about the framework concept in darwin

Edit: should I mention darwin-maintainers instead ? the group has no description, so I'm unsure

reckenrode · 2024-12-02T14:10:17Z

Specifying individual Darwin frameworks is no longer necessary as of 24.11. By default, Darwin provides an SDK with all that you should need. If your package needs a newer version, you can add that SDK as a package. See https://nixos.org/manual/nixpkgs/stable/#sec-darwin for details.

* [Nix] initial packaging & flake * [Nix] setup CI * [CMake] FindQGLViewer: fix include dir computation we use `#include <QGLViewer/qglviewer.h>`, so `QGLViewer_INCLUDE_DIR` must not include `QGLViewer` component. Also, on darwin, headers are installed in Headers dir, not include, ref: https://github.com/GillesDebunne/libQGLViewer/blob/ba9a875784afbb7ee73088fe0e8701c31bc7277d/QGLViewer/QGLViewer.pro#L138 * [Nix] fix build on macos This require fixes in upstream nixpkgs: NixOS/nixpkgs#348549 So we can use the source of that PR for now * [CMake] FindQGLViewer: fix for Qt6 ref. https://github.com/GillesDebunne/libQGLViewer/blob/ba9a875784afbb7ee73088fe0e8701c31bc7277d/QGLViewer/QGLViewer.pro#L176 * [Nix] Qt5 -> Qt6 * [CMake] fix typo for Qt6 * [CMake] fix SOFA_GUI_QT_HAVE_QT6 definition without this, `lib/cmake/Sofa.GUI.Qt/Sofa.GUI.QtConfig.cmake` has: > `set(SOFA_GUI_QT_HAVE_QT6 0)` and therefore, in SofaPython3, `find_package(QGLViewer QUIET REQUIRED)` is not called, and build ends up with: > [ 98%] Linking CXX shared library ../../lib/python3/site-packages/Sofa/Gui.cpython-312-x86_64-linux-gnu.so > […]/ld: cannot find -lQGLViewer: No such file or directory * [Nix] fixup lib path on Darwin TODO: This should be fixed in CMake instead, but I have no clue. error was: > dyld[61665]: Library not loaded: /nix/store/aalbn4pznxwy18ydjmb15c3y4izj8isi-sofa-24.06.00/lib/libSceneChecking.24.12.99.dylib > Referenced from: <8B75C775-7FE5-3755-A190-B11A3F4F6666> /nix/store/aalbn4pznxwy18ydjmb15c3y4izj8isi-sofa-24.06.00/bin/.runSofa-24.12.99-wrapped > Reason: tried: '/nix/store/aalbn4pznxwy18ydjmb15c3y4izj8isi-sofa-24.06.00/lib/libSceneChecking.24.12.99.dylib' (no such file), '/System/Volumes/Preboot/Cryptexes/OS/nix/store/aalbn4pznxwy18ydjmb15c3y4izj8isi-sofa-24.06.00/lib/libSceneChecking.24.12.99.dylib' (no such file), '/nix/store/aalbn4pznxwy18ydjmb15c3y4izj8isi-sofa-24.06.00/lib/libSceneChecking.24.12.99.dylib' (no such file), '/usr/local/lib/libSceneChecking.24.12.99.dylib' (no such file), '/usr/lib/libSceneChecking.24.12.99.dylib' (no such file, not in dyld cache) > zsh: abort ./result/bin/runSofa * [Nix] CI on macos too * nix: add nixGL * [Nix] fix package description Co-authored-by: Hugo <[email protected]> * Apply suggestions from code review --------- Co-authored-by: Hugo <[email protected]>

pkgs/development/libraries/libqglviewer/default.nix

* [Nix] initial packaging & flake * [Nix] setup CI * [CMake] FindQGLViewer: fix include dir computation we use `#include <QGLViewer/qglviewer.h>`, so `QGLViewer_INCLUDE_DIR` must not include `QGLViewer` component. Also, on darwin, headers are installed in Headers dir, not include, ref: https://github.com/GillesDebunne/libQGLViewer/blob/ba9a875784afbb7ee73088fe0e8701c31bc7277d/QGLViewer/QGLViewer.pro#L138 * [Nix] fix build on macos This require fixes in upstream nixpkgs: NixOS/nixpkgs#348549 So we can use the source of that PR for now * [CMake] FindQGLViewer: fix for Qt6 ref. https://github.com/GillesDebunne/libQGLViewer/blob/ba9a875784afbb7ee73088fe0e8701c31bc7277d/QGLViewer/QGLViewer.pro#L176 * [Nix] Qt5 -> Qt6 * [CMake] fix typo for Qt6 * [CMake] fix SOFA_GUI_QT_HAVE_QT6 definition without this, `lib/cmake/Sofa.GUI.Qt/Sofa.GUI.QtConfig.cmake` has: > `set(SOFA_GUI_QT_HAVE_QT6 0)` and therefore, in SofaPython3, `find_package(QGLViewer QUIET REQUIRED)` is not called, and build ends up with: > [ 98%] Linking CXX shared library ../../lib/python3/site-packages/Sofa/Gui.cpython-312-x86_64-linux-gnu.so > […]/ld: cannot find -lQGLViewer: No such file or directory * [Nix] fixup lib path on Darwin TODO: This should be fixed in CMake instead, but I have no clue. error was: > dyld[61665]: Library not loaded: /nix/store/aalbn4pznxwy18ydjmb15c3y4izj8isi-sofa-24.06.00/lib/libSceneChecking.24.12.99.dylib > Referenced from: <8B75C775-7FE5-3755-A190-B11A3F4F6666> /nix/store/aalbn4pznxwy18ydjmb15c3y4izj8isi-sofa-24.06.00/bin/.runSofa-24.12.99-wrapped > Reason: tried: '/nix/store/aalbn4pznxwy18ydjmb15c3y4izj8isi-sofa-24.06.00/lib/libSceneChecking.24.12.99.dylib' (no such file), '/System/Volumes/Preboot/Cryptexes/OS/nix/store/aalbn4pznxwy18ydjmb15c3y4izj8isi-sofa-24.06.00/lib/libSceneChecking.24.12.99.dylib' (no such file), '/nix/store/aalbn4pznxwy18ydjmb15c3y4izj8isi-sofa-24.06.00/lib/libSceneChecking.24.12.99.dylib' (no such file), '/usr/local/lib/libSceneChecking.24.12.99.dylib' (no such file), '/usr/lib/libSceneChecking.24.12.99.dylib' (no such file, not in dyld cache) > zsh: abort ./result/bin/runSofa * [Nix] CI on macos too * nix: add nixGL * [Nix] fix package description Co-authored-by: Hugo <[email protected]> * Apply suggestions from code review --------- Co-authored-by: Hugo <[email protected]>

nim65s · 2025-02-05T12:53:19Z

`nixpkgs-review` result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 348549

`x86_64-linux`

❌ 1 package failed to build:

rtabmap

✅ 5 packages built:

g2o
g2o.debug
g2o.dev
kdePackages.libqglviewer (qt6Packages.libqglviewer)
libsForQt5.libqglviewer

`aarch64-darwin`

⏩ 2 packages marked as broken and skipped:

g2o
g2o.dev

✅ 2 packages built:

kdePackages.libqglviewer (qt6Packages.libqglviewer)
libsForQt5.libqglviewer

GaetanLepage · 2025-02-14T10:01:18Z

Can you squash your commits please? Maybe keep one or two if necessary, but 8 feels a bit too granular for this diff.

Co-authored-by: Niklas Korz <[email protected]>

nim65s · 2025-02-14T11:04:55Z

done

GaetanLepage

LGTM, thanks!

remove use of absolute path on darwin

GaetanLepage · 2025-02-14T13:34:02Z

pcl issues addressed in #382027.

GaetanLepage · 2025-02-14T13:59:56Z

Anyway, @SuperSandro2000 's review is blocking the merge, so I'll let him press the button.

GaetanLepage · 2025-02-14T23:51:52Z

`nixpkgs-review` result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 348549

`x86_64-linux`

⏩ 1 package marked as broken and skipped:

rtabmap

✅ 5 packages built:

g2o
g2o.debug
g2o.dev
kdePackages.libqglviewer (qt6Packages.libqglviewer)
libsForQt5.libqglviewer (plasma5Packages.libqglviewer)

`aarch64-linux`

⏩ 1 package marked as broken and skipped:

rtabmap

✅ 5 packages built:

g2o
g2o.debug
g2o.dev
kdePackages.libqglviewer (qt6Packages.libqglviewer)
libsForQt5.libqglviewer (plasma5Packages.libqglviewer)

`x86_64-darwin`

⏩ 2 packages marked as broken and skipped:

g2o
g2o.dev

✅ 2 packages built:

kdePackages.libqglviewer (qt6Packages.libqglviewer)
libsForQt5.libqglviewer (plasma5Packages.libqglviewer)

`aarch64-darwin`

⏩ 2 packages marked as broken and skipped:

g2o
g2o.dev

✅ 2 packages built:

kdePackages.libqglviewer (qt6Packages.libqglviewer)
libsForQt5.libqglviewer (plasma5Packages.libqglviewer)

Feedback has been addressed.

This comment was marked as outdated.

Sign in to view

ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Oct 14, 2024

This comment was marked as outdated.

Sign in to view

ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Oct 14, 2024

nim65s force-pushed the qt6-libqglviewer branch 2 times, most recently from 19fd3cb to 8e906b3 Compare October 14, 2024 18:21

nim65s marked this pull request as ready for review October 14, 2024 19:04

nim65s added a commit to nim65s/sofa that referenced this pull request Oct 16, 2024

[Nix] fix build on macos

1708b79

This require fixes in upstream nixpkgs: NixOS/nixpkgs#348549 So we can use the source of that PR for now

nim65s mentioned this pull request Oct 16, 2024

[workflow][Nix] initial packaging & flake sofa-framework/sofa#5059

Merged

nim65s added a commit to nim65s/sofa that referenced this pull request Nov 19, 2024

[Nix] fix build on macos

3a11a38

This require fixes in upstream nixpkgs: NixOS/nixpkgs#348549 So we can use the source of that PR for now

wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 31, 2024

nim65s force-pushed the qt6-libqglviewer branch from 8e906b3 to 744ce49 Compare January 27, 2025 11:24

ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 27, 2025

nim65s force-pushed the qt6-libqglviewer branch from 744ce49 to 7855bad Compare January 27, 2025 11:34

This comment was marked as outdated.

Sign in to view

SuperSandro2000 previously requested changes Jan 27, 2025

View reviewed changes

pkgs/development/libraries/libqglviewer/default.nix Outdated Show resolved Hide resolved

pkgs/development/libraries/libqglviewer/default.nix Outdated Show resolved Hide resolved

niklaskorz reviewed Jan 27, 2025

View reviewed changes

pkgs/development/libraries/libqglviewer/default.nix Outdated Show resolved Hide resolved

This comment was marked as resolved.

Sign in to view

nim65s marked this pull request as draft February 5, 2025 11:25

nim65s force-pushed the qt6-libqglviewer branch from 336b1f5 to ac8f4e8 Compare February 5, 2025 12:35

nim65s marked this pull request as ready for review February 5, 2025 12:53

nim65s and others added 2 commits February 14, 2025 12:02

qt6Packages.libqglviewer: init at 2.9.1

9dc66d6

libqglviewer: clean

4dcb305

Co-authored-by: Niklas Korz <[email protected]>

nim65s force-pushed the qt6-libqglviewer branch from ac8f4e8 to 0e1704e Compare February 14, 2025 11:04

GaetanLepage approved these changes Feb 14, 2025

View reviewed changes

libqglviewer: fix NixOS#348484

280c2bf

remove use of absolute path on darwin

nim65s force-pushed the qt6-libqglviewer branch from 0e1704e to 280c2bf Compare February 14, 2025 11:06

nim65s requested a review from SuperSandro2000 February 14, 2025 11:07

GaetanLepage merged commit 5757120 into NixOS:master Feb 14, 2025
26 of 27 checks passed

nim65s deleted the qt6-libqglviewer branch February 15, 2025 00:03

nim65s mentioned this pull request Feb 12, 2026

Update cachix/install-nix-action to version 31 sofa-framework/SofaPython3#572

Open

Uh oh!

Comments

Conversation

nim65s commented Oct 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Things done

Uh oh!

This comment was marked as outdated.

This comment was marked as outdated.

nim65s commented Oct 14, 2024

Uh oh!

nim65s commented Dec 2, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

reckenrode commented Dec 2, 2024

Uh oh!

This comment was marked as outdated.

Uh oh!

Uh oh!

Uh oh!

This comment was marked as resolved.

nim65s commented Feb 5, 2025

nixpkgs-review result

x86_64-linux

aarch64-darwin

Uh oh!

GaetanLepage commented Feb 14, 2025

Uh oh!

nim65s commented Feb 14, 2025

Uh oh!

GaetanLepage left a comment

Choose a reason for hiding this comment

Uh oh!

GaetanLepage commented Feb 14, 2025

Uh oh!

GaetanLepage commented Feb 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GaetanLepage commented Feb 14, 2025

nixpkgs-review result

x86_64-linux

aarch64-linux

x86_64-darwin

aarch64-darwin

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

nim65s commented Oct 14, 2024 •

edited

Loading

nim65s commented Dec 2, 2024 •

edited

Loading

`nixpkgs-review` result

`x86_64-linux`

`aarch64-darwin`

GaetanLepage commented Feb 14, 2025 •

edited

Loading

`nixpkgs-review` result

`x86_64-linux`

`aarch64-linux`

`x86_64-darwin`

`aarch64-darwin`