Skip to content

Commit 238f699

Browse files
authored
small env fixes on a fresh install (#778)
* libjpegturbo added to flake.nix, removed .envrc (we should use symlinking depending on the env) * proper venv loading Former-commit-id: f7c75f6
1 parent 7c82500 commit 238f699

4 files changed

Lines changed: 16 additions & 9 deletions

File tree

.envrc

Lines changed: 0 additions & 5 deletions
This file was deleted.

.envrc.nix

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,10 @@ if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
22
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
33
fi
44
use flake .
5+
for venv in venv .venv env; do
6+
if [[ -f "$venv/bin/activate" ]]; then
7+
source "$venv/bin/activate"
8+
break
9+
fi
10+
done
511
dotenv_if_exists

.envrc.venv

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1-
source env/bin/activate
1+
for venv in venv .venv env; do
2+
if [[ -f "$venv/bin/activate" ]]; then
3+
source "$venv/bin/activate"
4+
break
5+
fi
6+
done
27
dotenv_if_exists

flake.nix

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
python312Packages.gst-python
4444

4545
### Open3D & build-time
46-
eigen cmake ninja jsoncpp libjpeg libpng
46+
eigen cmake ninja jsoncpp libjpeg libjpeg_turbo libpng
4747

4848
### LCM (Lightweight Communications and Marshalling)
4949
lcm
@@ -62,8 +62,9 @@
6262
pkgs.xorg.libXrender pkgs.xorg.libXdamage pkgs.xorg.libXcomposite
6363
pkgs.xorg.libxcb pkgs.xorg.libXScrnSaver pkgs.xorg.libXxf86vm
6464
pkgs.udev pkgs.portaudio pkgs.SDL2.dev pkgs.zlib pkgs.glib pkgs.gtk3
65-
pkgs.gdk-pixbuf pkgs.gobject-introspection pkgs.lcm pkgs.pcre2
66-
pkgs.gst_all_1.gstreamer pkgs.gst_all_1.gst-plugins-base]}:$LD_LIBRARY_PATH"
65+
pkgs.gdk-pixbuf pkgs.gobject-introspection pkgs.lcm
66+
pkgs.gst_all_1.gstreamer pkgs.gst_all_1.gst-plugins-base
67+
pkgs.libjpeg_turbo]}:$LD_LIBRARY_PATH"
6768
6869
export DISPLAY=:0
6970
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"

0 commit comments

Comments
 (0)