tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1From 1e792a4e7356f070856e4bf5775a07b18c3cc5ee Mon Sep 17 00:00:00 2001
2From: jopejoe1 <johannes@joens.email>
3Date: Sat, 7 Sep 2024 23:28:25 +0200
4Subject: [PATCH] fix finding libs
5
6---
7 alvr/server_openvr/build.rs | 18 +++---------------
8 alvr/session/build.rs | 4 +---
9 2 files changed, 4 insertions(+), 18 deletions(-)
10
11diff --git a/alvr/server_openvr/build.rs b/alvr/server_openvr/build.rs
12index b9bc4bd8..0581de0d 100644
13--- a/alvr/server_openvr/build.rs
14+++ b/alvr/server_openvr/build.rs
15@@ -1,24 +1,12 @@
16-use std::{env, path::PathBuf};
17+use std::{env, path::{Path, PathBuf}};
18
19 fn get_ffmpeg_path() -> PathBuf {
20- let ffmpeg_path = alvr_filesystem::deps_dir()
21- .join(if cfg!(target_os = "linux") {
22- "linux"
23- } else {
24- "windows"
25- })
26- .join("ffmpeg");
27-
28- if cfg!(target_os = "linux") {
29- ffmpeg_path.join("alvr_build")
30- } else {
31- ffmpeg_path
32- }
33+ Path::new("@ffmpeg@").to_owned()
34 }
35
36 #[cfg(all(target_os = "linux", feature = "gpl"))]
37 fn get_linux_x264_path() -> PathBuf {
38- alvr_filesystem::deps_dir().join("linux/x264/alvr_build")
39+ Path::new("@x264@").to_owned()
40 }
41
42 fn main() {
43--
442.46.0
45