diff --git a/flake.lock b/flake.lock index 3200a24..2c4bd8a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1737563566, - "narHash": "sha256-GLJvkOG29XCynQm8XWPyykMRqIhxKcBARVu7Ydrz02M=", + "lastModified": 1737689766, + "narHash": "sha256-ivVXYaYlShxYoKfSo5+y5930qMKKJ8CLcAoIBPQfJ6s=", "owner": "ipetkov", "repo": "crane", - "rev": "849376434956794ebc7a6b487d31aace395392ba", + "rev": "6fe74265bbb6d016d663b1091f015e2976c4a527", "type": "github" }, "original": { @@ -35,11 +35,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737469691, - "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -64,11 +64,11 @@ ] }, "locked": { - "lastModified": 1737599167, - "narHash": "sha256-S2rHCrQWCDVp63XxL/AQbGr1g5M8Zx14C7Jooa4oM8o=", + "lastModified": 1738031147, + "narHash": "sha256-F4Iuu4YmqbIP7pba3tvfT2jh+Ydri4Hm51Gn0ep504w=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "38374302ae9edf819eac666d1f276d62c712dd06", + "rev": "9a55a224af34b4f74526c261aeccd8d40af5e4f2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 42dc4b9..169f015 100644 --- 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; }; } );