Skip to content

Commit 74ac365

Browse files
CopeFiendCopeFiend
andauthored
Update nix flakes (#909)
* Updated Nix flakes * Updated Nix flake template * Added updated flake.lock --------- Co-authored-by: CopeFiend <copefiend@noreply.codeberg.org>
1 parent 0ab4c6a commit 74ac365

3 files changed

Lines changed: 28 additions & 14 deletions

File tree

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,24 @@
2929
{
3030
devShells = forAllSystems ({ pkgs }: with pkgs; {
3131
default = mkShell rec {
32-
buildInputs = [
32+
nativeBuildInputs = [
33+
pkg-config
3334
rust-bin.stable.latest.default
35+
];
3436

35-
pkg-config
36-
xorg.libxcb
37+
buildInputs = [
38+
libx11
39+
libxcb
3740
alsa-lib
3841
wayland
3942
libxkbcommon
4043
libGL
4144
];
42-
LD_LIBRARY_PATH = "${lib.makeLibraryPath buildInputs}";
45+
46+
LD_LIBRARY_PATH = lib.makeLibraryPath buildInputs;
47+
48+
# Remove this if you don't need LSP support
49+
RUST_SRC_PATH = "${rust-bin.stable.latest.rust-src}/lib/rustlib/src/rust/library";
4350
};
4451
});
4552
};

template-core/src/nixos/flake.nix

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,24 @@
2929
{
3030
devShells = forAllSystems ({ pkgs }: with pkgs; {
3131
default = mkShell rec {
32-
buildInputs = [
32+
nativeBuildInputs = [
33+
pkg-config
3334
rust-bin.stable.latest.default
35+
];
3436

35-
pkg-config
36-
xorg.libxcb
37+
buildInputs = [
38+
libx11
39+
libxcb
3740
alsa-lib
3841
wayland
3942
libxkbcommon
4043
libGL
4144
];
42-
LD_LIBRARY_PATH = "${lib.makeLibraryPath buildInputs}";
45+
46+
LD_LIBRARY_PATH = lib.makeLibraryPath buildInputs;
47+
48+
# Remove this if you don't need LSP support
49+
RUST_SRC_PATH = "${rust-bin.stable.latest.rust-src}/lib/rustlib/src/rust/library";
4350
};
4451
});
4552
};

0 commit comments

Comments
 (0)