NotAShelf/pinakes
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

nix: cleanup; get rust-analyzer from overlay

Browse source 
Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I2bfd563820ce6258798d8f06247e4ffe6a6a6964
This commit is contained in:
raf 2026-02-09 14:34:17 +03:00
commit d6665c73ff
Signed by: NotAShelf
GPG key ID: 29D95B64378DB4BF
2 changed files with 65 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

14
flake.nix
View file

@ -1,5 +1,4 @@
{ {
description = "Rust Project Template";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
rust-overlay = { rust-overlay = {
@ -9,27 +8,18 @@
}; };
outputs = { outputs = {
self,
nixpkgs, nixpkgs,
rust-overlay, rust-overlay,
...
}: let }: let
systems = ["x86_64-linux" "aarch64-linux"]; systems = ["x86_64-linux" "aarch64-linux"];
forEachSystem = nixpkgs.lib.genAttrs systems; forEachSystem = nixpkgs.lib.genAttrs systems;
pkgsForEach = nixpkgs.legacyPackages; pkgsForEach = nixpkgs.legacyPackages;
in { in {
packages = forEachSystem (system: let
pkgs = pkgsForEach.${system};
in {
mercant = pkgs.callPackage ./nix/packages/mercant.nix {};
webview-sdk = pkgs.callPackage ./nix/packages/webview.nix {};
});
devShells = forEachSystem (system: let devShells = forEachSystem (system: let
pkgs = nixpkgs.legacyPackages.${system}.extend rust-overlay.overlays.default; pkgs = pkgsForEach.${system}.extend rust-overlay.overlays.default;
in { in {
default = pkgs.callPackage ./nix/shell.nix {}; default = pkgs.callPackage ./nix/shell.nix {};
}); });
hydraJobs = self.packages;
}; };
} }

15
nix/shell.nix
View file

@ -4,13 +4,14 @@
# rust-overlay params # rust-overlay params
extraComponents ? [], extraComponents ? [],
extraTargets ? [], extraTargets ? [],
}: }: let
pkgs.mkShell { inherit (pkgs.rustc) llvmPackages;
name = "mercant-devshell"; in
pkgs.mkShell {
name = "pinakes-dev";
packages = [ packages = [
pkgs.taplo # TOML formatter pkgs.taplo # TOML formatter
pkgs.lldb # debugger pkgs.lldb # debugger
pkgs.rust-analyzer-unwrapped # LSP
pkgs.llvm pkgs.llvm
pkgs.libiconv pkgs.libiconv
@ -23,7 +24,7 @@ pkgs.mkShell {
# This is not exactly necessary, but it allows for compiling for various targets # This is not exactly necessary, but it allows for compiling for various targets
# with the least amount of friction. # with the least amount of friction.
(rust-bin.nightly.latest.default.override { (rust-bin.nightly.latest.default.override {
extensions = ["rustfmt" "rust-analyzer" "clippy"] ++ extraComponents; extensions = ["rustfmt" "rust-analyzer" "clippy" "rust-analyzer"] ++ extraComponents;
targets = targets =
[ [
"wasm32-unknown-unknown" # web "wasm32-unknown-unknown" # web
@ -55,7 +56,7 @@ pkgs.mkShell {
env = { env = {
# Allow Cargo to use lld and clang properly # Allow Cargo to use lld and clang properly
LIBCLANG_PATH = "${pkgs.libclang.lib}/lib"; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
RUSTFLAGS = "-C link-arg=-fuse-ld=lld"; RUSTFLAGS = "-C link-arg=-fuse-ld=lld";
# 'cargo llvm-cov' reads these environment variables to find these # 'cargo llvm-cov' reads these environment variables to find these
@ -78,4 +79,4 @@ pkgs.mkShell {
pkgs.kdePackages.wayland pkgs.kdePackages.wayland
]}"; ]}";
}; };
} }