From 740f081d7ea12ce16e86f9b85b6c6a93b930c8b6 Mon Sep 17 00:00:00 2001 From: Nelson Torres Date: Wed, 29 Jan 2025 23:55:44 +0000 Subject: [PATCH] Default.nix fix: Since the last `poetry` update the command `poetry shell` have been moved to a plugin, this affects the entire instalation, so now we need to add more deps to the `buildInputs` and added to the `LD_LIBRARY_PATH` To run a command now you need to do something like this: `poetry run piker ...` --- default.nix | 140 +++++++++++++++++++++++++++++++++++++++++++++++++ pyproject.toml | 1 + 2 files changed, 141 insertions(+) create mode 100644 default.nix diff --git a/default.nix b/default.nix new file mode 100644 index 00000000..d6bdeb2a --- /dev/null +++ b/default.nix @@ -0,0 +1,140 @@ +with (import {}); +let + glibStorePath = lib.getLib glib; + zstdStorePath = lib.getLib zstd; + dbusStorePath = lib.getLib dbus; + libGLStorePath = lib.getLib libGL; + freetypeStorePath = lib.getLib freetype; + qt6baseStorePath = lib.getLib qt6.qtbase; + fontconfigStorePath = lib.getLib fontconfig; + libxkbcommonStorePath = lib.getLib libxkbcommon; + xcbutilcursorStorePath = lib.getLib xcb-util-cursor; + + qtpyStorePath = lib.getLib python312Packages.qtpy; + pyqt6StorePath = lib.getLib python312Packages.pyqt6; + pyqt6SipStorePath = lib.getLib python312Packages.pyqt6-sip; + rapidfuzzStorePath = lib.getLib python312Packages.rapidfuzz; + qdarkstyleStorePath = lib.getLib python312Packages.qdarkstyle; + + xorgLibX11StorePath = lib.getLib xorg.libX11; + xorgLibxcbStorePath = lib.getLib xorg.libxcb; + xorgxcbutilwmStorePath = lib.getLib xorg.xcbutilwm; + xorgxcbutilimageStorePath = lib.getLib xorg.xcbutilimage; + xorgxcbutilerrorsStorePath = lib.getLib xorg.xcbutilerrors; + xorgxcbutilkeysymsStorePath = lib.getLib xorg.xcbutilkeysyms; + xorgxcbutilrenderutilStorePath = lib.getLib xorg.xcbutilrenderutil; +in +stdenv.mkDerivation { + name = "piker-qt6-poetry-shell"; + buildInputs = [ + # System requirements. + glib + dbus + zstd + libGL + freetype + qt6.qtbase + libgcc.lib + fontconfig + libxkbcommon + + # Xorg requirements + xcb-util-cursor + xorg.libxcb + xorg.libX11 + xorg.xcbutilwm + xorg.xcbutilimage + xorg.xcbutilerrors + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + + # Python requirements. + python312Full + python312Packages.poetry-core + python312Packages.qdarkstyle + python312Packages.rapidfuzz + python312Packages.pyqt6 + python312Packages.qtpy + ]; + src = null; + shellHook = '' + set -e + + # Set the Qt plugin path + # export QT_DEBUG_PLUGINS=1 + + QTBASE_PATH="${qt6baseStorePath}/lib" + QT_PLUGIN_PATH="$QTBASE_PATH/qt-6/plugins" + QT_QPA_PLATFORM_PLUGIN_PATH="$QT_PLUGIN_PATH/platforms" + + LIB_GCC_PATH="${libgcc.lib}/lib" + GLIB_PATH="${glibStorePath}/lib" + ZSTD_PATH="${zstdStorePath}/lib" + DBUS_PATH="${dbusStorePath}/lib" + LIBGL_PATH="${libGLStorePath}/lib" + FREETYPE_PATH="${freetypeStorePath}/lib" + FONTCONFIG_PATH="${fontconfigStorePath}/lib" + LIB_XKB_COMMON_PATH="${libxkbcommonStorePath}/lib" + + XCB_UTIL_CURSOR_PATH="${xcbutilcursorStorePath}/lib" + XORG_LIB_X11_PATH="${xorgLibX11StorePath}/lib" + XORG_LIB_XCB_PATH="${xorgLibxcbStorePath}/lib" + XORG_XCB_UTIL_IMAGE_PATH="${xorgxcbutilimageStorePath}/lib" + XORG_XCB_UTIL_WM_PATH="${xorgxcbutilwmStorePath}/lib" + XORG_XCB_UTIL_RENDER_UTIL_PATH="${xorgxcbutilrenderutilStorePath}/lib" + XORG_XCB_UTIL_KEYSYMS_PATH="${xorgxcbutilkeysymsStorePath}/lib" + XORG_XCB_UTIL_ERRORS_PATH="${xorgxcbutilerrorsStorePath}/lib" + + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$QTBASE_PATH" + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$QT_PLUGIN_PATH" + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$QT_QPA_PLATFORM_PLUGIN_PATH" + + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_GCC_PATH" + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DBUS_PATH" + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$GLIB_PATH" + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ZSTD_PATH" + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIBGL_PATH" + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$FONTCONFIG_PATH" + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$FREETYPE_PATH" + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_XKB_COMMON_PATH" + + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XCB_UTIL_CURSOR_PATH" + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XORG_LIB_X11_PATH" + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XORG_LIB_XCB_PATH" + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XORG_XCB_UTIL_IMAGE_PATH" + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XORG_XCB_UTIL_WM_PATH" + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XORG_XCB_UTIL_RENDER_UTIL_PATH" + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XORG_XCB_UTIL_KEYSYMS_PATH" + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XORG_XCB_UTIL_ERRORS_PATH" + + export LD_LIBRARY_PATH + + RPDFUZZ_PATH="${rapidfuzzStorePath}/lib/python3.12/site-packages" + QDRKSTYLE_PATH="${qdarkstyleStorePath}/lib/python3.12/site-packages" + QTPY_PATH="${qtpyStorePath}/lib/python3.12/site-packages" + PYQT6_PATH="${pyqt6StorePath}/lib/python3.12/site-packages" + PYQT6_SIP_PATH="${pyqt6SipStorePath}/lib/python3.12/site-packages" + + PATCH="$PATCH:$RPDFUZZ_PATH" + PATCH="$PATCH:$QDRKSTYLE_PATH" + PATCH="$PATCH:$QTPY_PATH" + PATCH="$PATCH:$PYQT6_PATH" + PATCH="$PATCH:$PYQT6_SIP_PATH" + + export PATCH + + # Maybe create venv & install deps + poetry install --with uis + + # Use pyqt6 from System, patch activate script + ACTIVATE_SCRIPT_PATH="$(poetry env info --path)/bin/activate" + + if grep -q "$PATCH" "$ACTIVATE_SCRIPT_PATH"; then + echo "venv is already patched." + else + echo "patching $ACTIVATE_SCRIPT_PATH to use pyqt6 from nixos..." + sed -i "\$i$PATCH" $ACTIVATE_SCRIPT_PATH + fi + + ''; +} diff --git a/pyproject.toml b/pyproject.toml index c97841e3..172dcf2d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -132,6 +132,7 @@ ledger = 'piker.accounting.cli:ledger' [project] +name="piker" keywords=[ "async", "trading",