diff --git a/alvr/xtask/src/dependencies.rs b/alvr/xtask/src/dependencies.rs index 379719822a..12af67d585 100644 --- a/alvr/xtask/src/dependencies.rs +++ b/alvr/xtask/src/dependencies.rs @@ -264,7 +264,7 @@ pub fn build_ffmpeg_linux(nvenc_flag: bool, deps_path: &Path) { ]; let env_vars = format!( - "PKG_CONFIG_PATH='{}'", + "PKG_CONFIG_PATH=$PKG_CONFIG_PATH:'{}'", header_build_dir.join("lib/pkgconfig").display() ); let flags_combined = flags.join(" "); diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000000..671ce40a43 --- /dev/null +++ b/shell.nix @@ -0,0 +1,19 @@ +{ pkgs ? import { } }: +pkgs.mkShell.override { stdenv = pkgs.cudaPackages.backendStdenv; } { + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ + pkgs.cudaPackages.cuda_nvcc + pkgs.cudaPackages.cuda_cudart + pkgs.cudaPackages.libnpp + + pkgs.nasm + + pkgs.vulkan-headers + pkgs.libva + pkgs.libdrm + ]; + + shellHook = '' + unset AS + ''; +}