Merge pull request #89 from NotLebedev/flake-fix

Fix nix flake
MalpenZibo · Jan 23, 2025 · 6e81713 · 6e81713
2 parents 96103fa + e7c6579
commit 6e81713
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 55 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -13,7 +13,7 @@
     };
   };
 
-  outputs = { self, crane, nixpkgs, flake-utils, rust-overlay }:
+  outputs = { crane, nixpkgs, flake-utils, rust-overlay, ... }:
     flake-utils.lib.eachDefaultSystem
       (system:
         let
@@ -24,7 +24,7 @@
 
           craneLib = crane.mkLib pkgs;
 
-          deps = with pkgs; [
+          buildInputs = with pkgs; [
             rust-bin.stable.latest.default
             rustPlatform.bindgenHook
             pkg-config
@@ -36,34 +36,33 @@
             vulkan-loader
           ];
 
-          libPath = with pkgs; lib.makeLibraryPath [
+          runtimeDependencies = with pkgs; [
             libpulseaudio
             wayland
             mesa.drivers
             vulkan-loader
             libGL
           ];
         in
-        with pkgs;
         {
           # `nix build` and `nix run`
           defaultPackage = craneLib.buildPackage {
             src = ./.;
 
-            nativeBuildInputs = [ pkgs.makeWrapper ];
+            nativeBuildInputs = with pkgs; [
+              makeWrapper
+              pkg-config
+              autoPatchelfHook # Add runtimeDependencies to rpath
+            ];
 
-            buildInputs = deps;
-
-            postInstall = ''
-              wrapProgram "$out/bin/ashell" --prefix LD_LIBRARY_PATH : "${libPath}"
-            '';
+            inherit buildInputs runtimeDependencies;
           };
 
           # `nix develop`
-          devShells.default = mkShell {
-            buildInputs = deps;
+          devShells.default = pkgs.mkShell {
+            inherit buildInputs;
 
-            LD_LIBRARY_PATH = libPath;
+            LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath runtimeDependencies;
           };
         }
       );