Merge pull request #95 from MalpenZibo/fix-nix-flake

Fix nix flake on non NixOS system
MalpenZibo · Jan 28, 2025 · 018f6a2 · 018f6a2
2 parents 6e81713 + 980c9bc
commit 018f6a2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -42,7 +42,10 @@
             mesa.drivers
             vulkan-loader
             libGL
+            libglvnd
           ];
+
+          ldLibraryPath = pkgs.lib.makeLibraryPath runtimeDependencies;
         in
         {
           # `nix build` and `nix run`
@@ -55,14 +58,18 @@
               autoPatchelfHook # Add runtimeDependencies to rpath
             ];
 
-            inherit buildInputs runtimeDependencies;
+            inherit buildInputs runtimeDependencies ldLibraryPath;
+
+            postInstall = ''
+              wrapProgram "$out/bin/ashell" --prefix LD_LIBRARY_PATH : "${ldLibraryPath}"
+            '';
           };
 
           # `nix develop`
           devShells.default = pkgs.mkShell {
-            inherit buildInputs;
+            inherit buildInputs ldLibraryPath;
 
-            LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath runtimeDependencies;
+            LD_LIBRARY_PATH = ldLibraryPath;
           };
         }
       );