pikers
/
piker
4
1
Fork 0
Code Issues 10 Pull Requests 14 Packages Projects Releases Wiki Activity

clean up

Nelson Torres 2025-01-23 11:50:36 -03:00
parent b7acd90617
commit 01b27dce1b
1 changed files with 19 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
default.nix
View File

@ -64,8 +64,8 @@ stdenv.mkDerivation {
# export QT_DEBUG_PLUGINS=1 # export QT_DEBUG_PLUGINS=1
QTBASE_PATH="${qt6baseStorePath}/lib" QTBASE_PATH="${qt6baseStorePath}/lib"
export QT_PLUGIN_PATH="$QTBASE_PATH/qt-6/plugins" QT_PLUGIN_PATH="$QTBASE_PATH/qt-6/plugins"
export QT_QPA_PLATFORM_PLUGIN_PATH="$QT_PLUGIN_PATH/platforms" QT_QPA_PLATFORM_PLUGIN_PATH="$QT_PLUGIN_PATH/platforms"
LIB_GCC_PATH="${libgcc.lib}/lib" LIB_GCC_PATH="${libgcc.lib}/lib"
GLIB_PATH="${glibStorePath}/lib" GLIB_PATH="${glibStorePath}/lib"
@ -85,27 +85,9 @@ stdenv.mkDerivation {
XORG_XCB_UTIL_KEYSYMS_PATH="${xorgxcbutilkeysymsStorePath}/lib" XORG_XCB_UTIL_KEYSYMS_PATH="${xorgxcbutilkeysymsStorePath}/lib"
XORG_XCB_UTIL_ERRORS_PATH="${xorgxcbutilerrorsStorePath}/lib" XORG_XCB_UTIL_ERRORS_PATH="${xorgxcbutilerrorsStorePath}/lib"
echo "glib path: $GLIB_PATH" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$QTBASE_PATH"
echo "zstd path: $ZSTD_PATH" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$QT_PLUGIN_PATH"
echo "dbus path: $DBUS_PATH" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$QT_QPA_PLATFORM_PLUGIN_PATH"
echo "libGL path: $LIBGL_PATH"
echo "libgcc.lib path: $LIB_GCC_PATH"
echo "freetype path: $FREETYPE_PATH"
echo "fontconfig path: $FONTCONFIG_PATH"
echo "libxkbcommon path: $LIB_XKB_COMMON_PATH"
echo ""
echo "xcb-util-cursor path: $XCB_UTIL_CURSOR_PATH"
echo "xorg.libxcb path: $XORG_LIB_XCB_PATH"
echo "xorg.libX11 path: $XORG_LIB_X11_PATH"
echo "xorg.xcbutilimage path: $XORG_XCB_UTIL_IMAGE_PATH"
echo "xorg.xcbutilwm path: $XORG_XCB_UTIL_WM_PATH"
echo "xorg.xcbutilrenderutil path: $XORG_XCB_UTIL_RENDER_UTIL_PATH"
echo "xorg.xcbutilkeysyms path: $XORG_XCB_UTIL_KEYSYMS_PATH"
echo "xorg.xcbutilerrors path: $XORG_XCB_UTIL_ERRORS_PATH"
echo ""
echo "qtbase path: $QTBASE_PATH"
echo "qt plugin path: $QT_PLUGIN_PATH"
echo ""
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_GCC_PATH" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_GCC_PATH"
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DBUS_PATH" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DBUS_PATH"
@ -125,38 +107,28 @@ stdenv.mkDerivation {
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XORG_XCB_UTIL_KEYSYMS_PATH" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XORG_XCB_UTIL_KEYSYMS_PATH"
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XORG_XCB_UTIL_ERRORS_PATH" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$XORG_XCB_UTIL_ERRORS_PATH"
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$QTBASE_PATH"
export LD_LIBRARY_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 # Maybe create venv & install deps
poetry install --with uis poetry install --with uis
# Use pyqt6 from System, patch activate script # Use pyqt6 from System, patch activate script
ACTIVATE_SCRIPT_PATH="$(poetry env info --path)/bin/activate" ACTIVATE_SCRIPT_PATH="$(poetry env info --path)/bin/activate"
export RPDFUZZ_PATH="${rapidfuzzStorePath}/lib/python3.12/site-packages"
export QDRKSTYLE_PATH="${qdarkstyleStorePath}/lib/python3.12/site-packages"
export QTPY_PATH="${qtpyStorePath}/lib/python3.12/site-packages"
export PYQT6_PATH="${pyqt6StorePath}/lib/python3.12/site-packages"
export PYQT6_SIP_PATH="${pyqt6SipStorePath}/lib/python3.12/site-packages"
echo "rapidfuzz at: $RPDFUZZ_PATH"
echo "qdarkstyle at: $QDRKSTYLE_PATH"
echo "qtpy at: $QTPY_PATH"
echo "pyqt6 at: $PYQT6_PATH"
echo "pyqt6-sip at: $PYQT6_SIP_PATH"
echo ""
PATCH="export PYTHONPATH=\""
PATCH="$PATCH\$RPDFUZZ_PATH"
PATCH="$PATCH:\$QDRKSTYLE_PATH"
PATCH="$PATCH:\$QTPY_PATH"
PATCH="$PATCH:\$PYQT6_PATH"
PATCH="$PATCH:\$PYQT6_SIP_PATH"
PATCH="$PATCH\""
if grep -q "$PATCH" "$ACTIVATE_SCRIPT_PATH"; then if grep -q "$PATCH" "$ACTIVATE_SCRIPT_PATH"; then
echo "venv is already patched." echo "venv is already patched."
else else
@ -164,7 +136,5 @@ stdenv.mkDerivation {
sed -i "\$i$PATCH" $ACTIVATE_SCRIPT_PATH sed -i "\$i$PATCH" $ACTIVATE_SCRIPT_PATH
fi fi
poetry run piker -b deribit chart btc-7feb25-100000-c.reversed_option.deribit
''; '';
} }