Skip to content
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.

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

[workflow][Nix] initial packaging & flake #5059

Open
wants to merge 10 commits into
base: master
Choose a base branch
from

Commits on Oct 14, 2024

  1. Configuration menu
    Copy the full SHA
    a993b27 View commit details
    Browse the repository at this point in the history
  2. [Nix] setup CI

    nim65s committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    86913f6 View commit details
    Browse the repository at this point in the history
  3. [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
    nim65s committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    e51daca View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. [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
    nim65s committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    1708b79 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a03a458 View commit details
    Browse the repository at this point in the history
  3. [Nix] Qt5 -> Qt6

    nim65s committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    6c3bfb7 View commit details
    Browse the repository at this point in the history
  4. [CMake] fix typo for Qt6

    nim65s committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    bd261b5 View commit details
    Browse the repository at this point in the history
  5. [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
    nim65s committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    6489fd1 View commit details
    Browse the repository at this point in the history
  6. [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
    nim65s committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    f9cfcd0 View commit details
    Browse the repository at this point in the history
  7. [Nix] CI on macos too

    nim65s committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    8808d24 View commit details
    Browse the repository at this point in the history