diff options
| author | Suyashtnt <suyashtnt@gmail.com> | 2024-07-08 15:13:00 +0200 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2024-07-08 17:42:09 +0300 |
| commit | f2290a43d9af3f272f5bb8d57c350b0896d0cd27 (patch) | |
| tree | 938c307d173e2cb6630ce9ad907cb0f90678466a | |
| parent | 451366308446aeb8ae4ee1cd55559381e93b9b39 (diff) | |
| download | niri-f2290a43d9af3f272f5bb8d57c350b0896d0cd27.tar.gz niri-f2290a43d9af3f272f5bb8d57c350b0896d0cd27.tar.bz2 niri-f2290a43d9af3f272f5bb8d57c350b0896d0cd27.zip | |
flake: update nix flake
Signed-off-by: Suyashtnt <suyashtnt@gmail.com>
| -rw-r--r-- | flake.lock | 36 | ||||
| -rw-r--r-- | flake.nix | 10 |
2 files changed, 25 insertions, 21 deletions
@@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1709610799, - "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=", + "lastModified": 1720226507, + "narHash": "sha256-yHVvNsgrpyNTXZBEokL8uyB2J6gB1wEx0KOJzoeZi1A=", "owner": "ipetkov", "repo": "crane", - "rev": "81c393c776d5379c030607866afef6406ca1be57", + "rev": "0aed560c5c0a61c9385bddff471a13036203e11c", "type": "github" }, "original": { @@ -28,11 +28,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1709274179, - "narHash": "sha256-O6EC6QELBLHzhdzBOJj0chx8AOcd4nDRECIagfT5Nd0=", + "lastModified": 1719815435, + "narHash": "sha256-K2xFp142onP35jcx7li10xUxNVEVRWjAdY8DSuR7Naw=", "owner": "nix-community", "repo": "fenix", - "rev": "4be608f4f81d351aacca01b21ffd91028c23cc22", + "rev": "ebfe2c639111d7e82972a12711206afaeeda2450", "type": "github" }, "original": { @@ -47,11 +47,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -62,11 +62,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", "owner": "numtide", "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", "type": "github" }, "original": { @@ -77,11 +77,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709386671, - "narHash": "sha256-VPqfBnIJ+cfa78pd4Y5Cr6sOWVW8GYHRVucxJGmRf8Q=", + "lastModified": 1720368505, + "narHash": "sha256-5r0pInVo5d6Enti0YwUSQK4TebITypB42bWy5su3MrQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa9a51752f1b5de583ad5213eb621be071806663", + "rev": "ab82a9612aa45284d4adf69ee81871a389669a9e", "type": "github" }, "original": { @@ -103,11 +103,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1709219524, - "narHash": "sha256-8HHRXm4kYQLdUohNDUuCC3Rge7fXrtkjBUf0GERxrkM=", + "lastModified": 1719760370, + "narHash": "sha256-fsxAuW6RxKZYjAP3biUC6C4vaYFhDfWv8lp1Tmx3ZCY=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "9efa23c4dacee88b93540632eb3d88c5dfebfe17", + "rev": "ea7fdada6a0940b239ddbde2048a4d7dac1efe1e", "type": "github" }, "original": { @@ -76,6 +76,7 @@ libglvnd # For libEGL xorg.libXcursor xorg.libXi + libxkbcommon ]; LIBCLANG_PATH = "${pkgs.libclang.lib}/lib"; @@ -89,9 +90,9 @@ checks.niri = niri; packages.default = niri; - devShells.default = pkgs.mkShell.override {stdenv = pkgs.clangStdenv;} { - inherit (niri) nativeBuildInputs buildInputs LIBCLANG_PATH; - packages = niri.runtimeDependencies; + devShells.default = pkgs.mkShell.override {stdenv = pkgs.clangStdenv;} rec { + inherit (niri) LIBCLANG_PATH; + packages = niri.runtimeDependencies ++ niri.nativeBuildInputs ++ niri.buildInputs; # Force linking to libEGL, which is always dlopen()ed, and to # libwayland-client, which is always dlopen()ed except by the @@ -102,6 +103,9 @@ "-lwayland-client" "-Wl,--pop-state" ]; + + LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath packages; + PKG_CONFIG_PATH = pkgs.lib.makeLibraryPath packages; }; } ); |
