envision: autopatchelf after build

pkgs/by-name/en/envision/autopatchelf.patch

@@ -0,0 +1,108 @@
+diff --git a/src/builders/build_basalt.rs b/src/builders/build_basalt.rs
+index 237fc24..3c9c8ec 100644
+--- a/src/builders/build_basalt.rs
++++ b/src/builders/build_basalt.rs
+@@ -86,6 +86,13 @@ pub fn get_build_basalt_jobs(profile: &Profile, clean_build: bool) -> VecDeque<W
+ format!("{}/share/basalt/thirdparty", profile.prefix),
+ ]),
+ ));
++ jobs.push_back(WorkerJob::new_cmd(
++ None,
++ "autopatchelf".into(),
++ Some(vec![
++ build_dir.clone()
++ ]),
++ ));
+
+ jobs
+ }
+diff --git a/src/builders/build_libsurvive.rs b/src/builders/build_libsurvive.rs
+index 8ddd206..587de7f 100644
+--- a/src/builders/build_libsurvive.rs
++++ b/src/builders/build_libsurvive.rs
+@@ -60,6 +60,13 @@ pub fn get_build_libsurvive_jobs(profile: &Profile, clean_build: bool) -> VecDeq
+ }
+ jobs.push_back(cmake.get_build_job());
+ jobs.push_back(cmake.get_install_job());
++ jobs.push_back(WorkerJob::new_cmd(
++ None,
++ "autopatchelf".into(),
++ Some(vec![
++ build_dir.clone()
++ ]),
++ ));
+
+ jobs
+ }
+diff --git a/src/builders/build_monado.rs b/src/builders/build_monado.rs
+index fb049c5..e21a764 100644
+--- a/src/builders/build_monado.rs
++++ b/src/builders/build_monado.rs
+@@ -68,6 +68,13 @@ pub fn get_build_monado_jobs(profile: &Profile, clean_build: bool) -> VecDeque<W
+ }
+ jobs.push_back(cmake.get_build_job());
+ jobs.push_back(cmake.get_install_job());
++ jobs.push_back(WorkerJob::new_cmd(
++ None,
++ "autopatchelf".into(),
++ Some(vec![
++ build_dir.clone()
++ ]),
++ ));
+
+ jobs
+ }
+diff --git a/src/builders/build_opencomposite.rs b/src/builders/build_opencomposite.rs
+index bf45567..9fe0264 100644
+--- a/src/builders/build_opencomposite.rs
++++ b/src/builders/build_opencomposite.rs
+@@ -43,6 +43,13 @@ pub fn get_build_opencomposite_jobs(profile: &Profile, clean_build: bool) -> Vec
+ jobs.push_back(cmake.get_prepare_job());
+ }
+ jobs.push_back(cmake.get_build_job());
++ jobs.push_back(WorkerJob::new_cmd(
++ None,
++ "autopatchelf".into(),
++ Some(vec![
++ build_dir.clone()
++ ]),
++ ));
+
+ jobs
+ }
+diff --git a/src/builders/build_openhmd.rs b/src/builders/build_openhmd.rs
+index 5fe612c..5211229 100644
+--- a/src/builders/build_openhmd.rs
++++ b/src/builders/build_openhmd.rs
+@@ -55,6 +55,13 @@ pub fn get_build_openhmd_jobs(profile: &Profile, clean_build: bool) -> VecDeque<
+ }
+ jobs.push_back(cmake.get_build_job());
+ jobs.push_back(cmake.get_install_job());
++ jobs.push_back(WorkerJob::new_cmd(
++ None,
++ "autopatchelf".into(),
++ Some(vec![
++ build_dir.clone()
++ ]),
++ ));
+
+ jobs
+ }
+diff --git a/src/builders/build_wivrn.rs b/src/builders/build_wivrn.rs
+index 52bfb66..b28ab5c 100644
+--- a/src/builders/build_wivrn.rs
++++ b/src/builders/build_wivrn.rs
+@@ -52,6 +52,13 @@ pub fn get_build_wivrn_jobs(profile: &Profile, clean_build: bool) -> VecDeque<Wo
+ }
+ jobs.push_back(cmake.get_build_job());
+ jobs.push_back(cmake.get_install_job());
++ jobs.push_back(WorkerJob::new_cmd(
++ None,
++ "autopatchelf".into(),
++ Some(vec![
++ build_dir.clone()
++ ]),
++ ));
+
+ jobs
+ }

pkgs/by-name/en/envision/package.nix

@@ -1,51 +1,54 @@
-{ buildFHSEnv, envision-unwrapped }:
+{
+ lib,
+ pkgs,
+ buildFHSEnv,
+ envision-unwrapped,
+}:
 
-buildFHSEnv {
- name = "envision";
-
- extraOutputsToInstall = [ "dev" ];
-
- strictDeps = true;
-
- targetPkgs =
- pkgs:
- [ pkgs.envision-unwrapped ]
- ++ (with pkgs; [
- glibc
- gcc
- ])
- ++ (
- # OpenHMD dependencies
- pkgs.openhmd.buildInputs ++ pkgs.openhmd.nativeBuildInputs
- )
- ++ (
- # OpenComposite dependencies
- pkgs.opencomposite.buildInputs ++ pkgs.opencomposite.nativeBuildInputs ++ [ pkgs.boost ]
- )
- ++ (
- # Monado dependencies
+let
+ runtimeBuildDeps =
+ pkgs':
+ with pkgs';
+ (
  (
- pkgs.monado.buildInputs
- ++ pkgs.monado.nativeBuildInputs
- ++ (with pkgs; [
+ # OpenHMD dependencies
+ openhmd.buildInputs ++ openhmd.nativeBuildInputs
+ )
+ ++ (
+ # OpenComposite dependencies
+ opencomposite.buildInputs ++ opencomposite.nativeBuildInputs ++ [ boost ]
+ )
+ ++ (
+ # Monado dependencies
+ monado.buildInputs
+ ++ monado.nativeBuildInputs
+ ++ [
  # Additional dependencies required by Monado when built using Envision
- mesa
- shaderc
+ mesa # TODO: Does this really need "mesa-common-dev"?
  xorg.libX11
  xorg.libxcb
  xorg.libXrandr
  xorg.libXrender
  xorg.xorgproto
- ])
+
+ # Not required for build, but autopatchelf requires them
+ glibc
+ SDL2
+ bluez
+ librealsense
+ onnxruntime
+ libusb1
+ libjpeg
+ libGL
+ ]
  )
- )
- ++ (
- # SteamVR driver dependencies
- [ pkgs.zlib ])
- ++ (
- # WiVRn dependencies
- # TODO: Replace with https://github.com/NixOS/nixpkgs/pull/316975 once merged
- (with pkgs; [
+ ++ [
+ # SteamVR dependencies
+ zlib
+ ]
+ ++ [
+ # WiVRn dependencies
+ # TODO: Replace with https://github.com/NixOS/nixpkgs/pull/316975 once merged
  avahi
  cmake
  cli11
@@ -65,11 +68,30 @@ buildFHSEnv {
  vulkan-loader
  vulkan-headers
  x264
- ])
- ++ (with pkgs; [
- android-tools # For adb installing WiVRn APKs
- ])
+ ]
  );
+in
+buildFHSEnv rec {
+ name = "envision";
+
+ extraOutputsToInstall = [
+ "dev"
+ "lib"
+ ];
+
+ strictDeps = true;
+
+ targetPkgs =
+ pkgs':
+ [
+ (pkgs'.envision-unwrapped.overrideAttrs (oldAttrs: {
+ patches = (oldAttrs.patches or [ ]) ++ [ ./autopatchelf.patch ]; # Adds an envision build step to run autopatchelf
+ }))
+ pkgs'.autopatchelf
+ pkgs'.gcc
+ pkgs'.android-tools # For adb installing WiVRn APKs
+ ]
+ ++ (runtimeBuildDeps pkgs');
 
  profile = ''
  export CMAKE_LIBRARY_PATH=/usr/lib
@@ -85,7 +107,10 @@ buildFHSEnv {
  ln -s ${envision-unwrapped}/share/metainfo/org.gabmus.envision.appdata.xml $out/share/metainfo
  '';
 
- runScript = "envision";
+ # Putting libgcc.lib in runtimeBuildDeps causes error "ld: cannot find crt1.o: No such file or directory"
+ runScript = "env libs=${
+ lib.makeLibraryPath ((runtimeBuildDeps pkgs) ++ [ pkgs.libgcc.lib ])
+ } envision --skip-dependency-check";
 
  meta = envision-unwrapped.meta // {
  description = "${envision-unwrapped.meta.description} (with build environment)";