Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .envrc

This file was deleted.

6 changes: 6 additions & 0 deletions .envrc.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 6 additions & 1 deletion .envrc.venv
Original file line number Diff line number Diff line change
@@ -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
7 changes: 4 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
Loading