From a3584c143eab10b8fa47b82ecbd9032d839fd9de Mon Sep 17 00:00:00 2001
From: Mariela Sassi <26252151+MarielaSassi@users.noreply.github.com>
Date: Fri, 3 Jan 2025 21:04:48 -0300
Subject: [PATCH] backport: always check parent directory to 1.x (#11960)

Co-authored-by: griffi-gh <prasol258@gmail.com>
Co-authored-by: Lucas Fernandes Nogueira <lucas@tauri.app>
Co-authored-by: Fabian-Lars <github@fabianlars.de>
fix #8679)
---
 .changes/enhance-resource-dir-linux.md |  5 +++++
 core/tauri-utils/src/platform.rs       | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 .changes/enhance-resource-dir-linux.md

diff --git a/.changes/enhance-resource-dir-linux.md b/.changes/enhance-resource-dir-linux.md
new file mode 100644
index 000000000..c528bad12
--- /dev/null
+++ b/.changes/enhance-resource-dir-linux.md
@@ -0,0 +1,5 @@
+---
+"tauri-utils": patch:bug
+---
+
+Enhance resource directory resolution to support running on distros like NixOS.
diff --git a/core/tauri-utils/src/platform.rs b/core/tauri-utils/src/platform.rs
index 2504a8a55..70e9ce58e 100644
--- a/core/tauri-utils/src/platform.rs
+++ b/core/tauri-utils/src/platform.rs
@@ -170,12 +170,12 @@ pub fn resource_dir(package_info: &PackageInfo, env: &Env) -> crate::Result<Path
 
   #[cfg(target_os = "linux")]
   {
-    res = if curr_dir.ends_with("/data/usr/bin") {
-      // running from the deb bundle dir
-      exe_dir
-        .join(format!("../lib/{}", package_info.package_name()))
-        .canonicalize()
-        .map_err(Into::into)
+    // (canonicalize checks for existence, so there's no need for an extra check)
+    res = if let Ok(bundle_dir) = exe_dir
+      .join(format!("../lib/{}", package_info.package_name()))
+      .canonicalize()
+    {
+      Ok(bundle_dir)
     } else if let Some(appdir) = &env.appdir {
       let appdir: &std::path::Path = appdir.as_ref();
       Ok(PathBuf::from(format!(