diff --git a/.envrc b/.envrc deleted file mode 100644 index a73ae4a035..0000000000 --- a/.envrc +++ /dev/null @@ -1,5 +0,0 @@ -if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then - source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM=" -fi -use flake . -dotenv diff --git a/.envrc.nix b/.envrc.nix index 4a6ade8151..a3f663db80 100644 --- a/.envrc.nix +++ b/.envrc.nix @@ -2,4 +2,10 @@ if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM=" fi use flake . +for venv in venv .venv env; do + if [[ -f "$venv/bin/activate" ]]; then + source "$venv/bin/activate" + break + fi +done dotenv_if_exists diff --git a/.envrc.venv b/.envrc.venv index a4b314c6f7..e315a030c7 100644 --- a/.envrc.venv +++ b/.envrc.venv @@ -1,2 +1,7 @@ -source env/bin/activate +for venv in venv .venv env; do + if [[ -f "$venv/bin/activate" ]]; then + source "$venv/bin/activate" + break + fi +done dotenv_if_exists diff --git a/flake.nix b/flake.nix index 0e8dbe60a1..eeef51c9dd 100644 --- a/flake.nix +++ b/flake.nix @@ -43,7 +43,7 @@ python312Packages.gst-python ### Open3D & build-time - eigen cmake ninja jsoncpp libjpeg libpng + eigen cmake ninja jsoncpp libjpeg libjpeg_turbo libpng ### LCM (Lightweight Communications and Marshalling) lcm @@ -62,8 +62,9 @@ pkgs.xorg.libXrender pkgs.xorg.libXdamage pkgs.xorg.libXcomposite pkgs.xorg.libxcb pkgs.xorg.libXScrnSaver pkgs.xorg.libXxf86vm pkgs.udev pkgs.portaudio pkgs.SDL2.dev pkgs.zlib pkgs.glib pkgs.gtk3 - pkgs.gdk-pixbuf pkgs.gobject-introspection pkgs.lcm pkgs.pcre2 - pkgs.gst_all_1.gstreamer pkgs.gst_all_1.gst-plugins-base]}:$LD_LIBRARY_PATH" + pkgs.gdk-pixbuf pkgs.gobject-introspection pkgs.lcm + pkgs.gst_all_1.gstreamer pkgs.gst_all_1.gst-plugins-base + pkgs.libjpeg_turbo]}:$LD_LIBRARY_PATH" export DISPLAY=:0 export GI_TYPELIB_PATH="${pkgs.gst_all_1.gstreamer}/lib/girepository-1.0:${pkgs.gst_all_1.gst-plugins-base}/lib/girepository-1.0:$GI_TYPELIB_PATH"