···

       
1
       
1
       
-
       
commit 3048885aa749774b5677ab8df8f1a3eeff125d7a

     

       
1
       
1
       
+
       
commit 0a258effd3492d7e4c11b4d175538c619699fbd6

     

       
2
       
2
       
 
       
Author: rnhmjoj <rnhmjoj@inventati.org>

     

       
3
       
3
       
-
       
Date:   Tue Aug 6 08:36:38 2024 +0200

     

       
3
       
3
       
+
       
Date:   Wed Oct 1 09:43:45 2025 +0200

     

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
    Fix assets path on NixOS

     

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
diff --git a/common/assets/src/lib.rs b/common/assets/src/lib.rs

     

       
8
       
8
       
-
       
index 03746dc4..c69d607b 100644

     

       
8
       
8
       
+
       
index 13102e8..898b23b 100644

     

       
9
       
9
       
 
       
--- a/common/assets/src/lib.rs

     

       
10
       
10
       
 
       
+++ b/common/assets/src/lib.rs

     

       
11
       
11
       
-
       
@@ -400,6 +400,13 @@ lazy_static! {

     

       
11
       
11
       
+
       
@@ -381,6 +381,9 @@ lazy_static! {

     

       
12
       
12
       
 
       
             }

     

       
13
       
13
       
 
       
         }

     

       
14
       
14
       
 
       
 

     

       
15
       
15
       
 
       
+        // 5. NixOS path

     

       
16
       
16
       
-
       
+        if let Some(executable) = std::env::args().nth(0).map(PathBuf::from) {

     

       
17
       
17
       
-
       
+            if let Some(package) = executable.ancestors().nth(2) {

     

       
18
       
18
       
-
       
+                paths.push(package.join("share/veloren"));

     

       
19
       
19
       
-
       
+            }

     

       
20
       
20
       
-
       
+        }

     

       
16
       
16
       
+
       
+        paths.push("@out@/share/veloren/".into());

     

       
21
       
17
       
 
       
+

     

       
22
       
18
       
 
       
         tracing::trace!("Possible asset locations paths={:?}", paths);

     

       
23
       
19
       
 
       
 

     

···

       
52
       
52
       
 
       
      println!("cargo:rustc-cfg=nightly");

     

       
53
       
53
       
 
       
    }

     

       
54
       
54
       
 
       
    EOF

     

       
55
       
55
       
+
       
    # Fix assets path

     

       
56
       
56
       
+
       
    substituteAllInPlace common/assets/src/lib.rs

     

       
55
       
57
       
 
       
  '';

     

       
56
       
58
       
 
       


     

       
57
       
59
       
 
       
  nativeBuildInputs = [