Working nix feature flag.

Author: makuru-org

alvr/server_openvr/Cargo.toml

@@ -11,6 +11,7 @@ crate-type = ["cdylib"]
 
 [features]
 gpl = [] # Enable for FFmpeg support on Windows. Always enabled on Linux
+nix = []
 
 [dependencies]
 alvr_common.workspace = true

alvr/server_openvr/build.rs

@@ -1,18 +1,31 @@
 use std::{env, path::PathBuf};
 
 fn get_ffmpeg_path() -> PathBuf {
-    let ffmpeg_path = alvr_filesystem::deps_dir()
-        .join(if cfg!(target_os = "linux") {
-            "linux"
-        } else {
-            "windows"
-        })
-        .join("ffmpeg");
+    if cfg!(not(feature = "nix")) {
+        let ffmpeg_path = alvr_filesystem::deps_dir()
+            .join(if cfg!(target_os = "linux") {
+                "linux"
+            } else {
+                "windows"
+            })
+            .join("ffmpeg");
 
-    if cfg!(target_os = "linux") {
-        ffmpeg_path.join("alvr_build")
+        if cfg!(target_os = "linux") {
+            ffmpeg_path.join("alvr_build")
+        } else {
+            ffmpeg_path
+        }
     } else {
-        ffmpeg_path
+        pkg_config::Config::new()
+            .probe("libavcodec")
+            .unwrap()
+            .to_owned()
+            .include_paths
+            .pop()
+            .unwrap()
+            .parent()
+            .unwrap()
+            .to_path_buf()
     }
 }
 

fix-finding-libs.patch

@@ -36,10 +36,9 @@
           pkg-config
           rustToolchain
           rustPlatform.bindgenHook
-	  llvmPackages.bintools
+          llvmPackages.bintools
           vulkan-headers
           vulkan-loader
-          #libGL
         ];
 
         dependencyPackages = [
@@ -76,8 +75,6 @@
           xvidcore
           bzip2
           gmp
-          jdk
-          jre
         ];
 
         nvidiaPackages = with cudaPackages; [
@@ -86,13 +83,6 @@
           libnpp
         ];
 
-        libsPatch = toString (
-          replaceVars ./fix-finding-libs.patch {
-            ffmpeg = lib.getDev ffmpeg;
-            x264 = lib.getDev x264;
-          }
-        );
-
         androidComposition = androidenv.composeAndroidPackages {
           minPlatformVersion = "28";
           maxPlatformVersion = "32";
@@ -152,9 +142,6 @@
                 ])
               ];
               RUST_BACKTRACE = "1";
-              shellHook = ''
-                git apply ${libsPatch}
-              '';
             };
       in
       {
@@ -169,7 +156,7 @@
             "-lssl"
           ];
           RUSTFLAGS = toString [
-	    "-C link-self-contained=-linker"
+            "-C link-self-contained=-linker"
             (map (a: "-C link-args=${a}") [
               "-Wl,--push-state,--no-as-needed"
               "-lEGL"
@@ -179,16 +166,11 @@
             ])
           ];
           cargoBuildFlags = [
+	    "--workspace"
             "--exclude alvr_xtask"
-            "--workspace"
           ];
           buildNoDefaultFeatures = true;
-          patches = [
-            (replaceVars ./fix-finding-libs.patch {
-              ffmpeg = lib.getDev ffmpeg;
-              x264 = lib.getDev x264;
-            })
-          ];
+          buildFeatures = [ "nix" ];
           version = "21.0.0-master"; # TODO Change to the release
           doCheck = false; # TODO Broken right now
           src = ./.;
@@ -213,6 +195,7 @@
             cp -r ./build/alvr_streamer_linux/share/. $out/share
             ln -s $out/lib $out/lib64
           '';
+          # TODO FIX that it needs to run the below command.
           postBuild = ''
             # Build SteamVR driver ("streamer")
             cargo xtask build-streamer --release