language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-04 17:14:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

use callPackageWith to cleanup some logic

Browse source
This commit is contained in:
John Murray 2023-11-14 22:28:01 -05:00
parent 81cd92f3fe
commit 3179773d90
No known key found for this signature in database
4 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flake.nix
View file

@ -155,6 +155,12 @@
formatter = pkgs.nixpkgs-fmt; formatter = pkgs.nixpkgs-fmt;
# You can build this package (the roc CLI) with the `nix build` command. # You can build this package (the roc CLI) with the `nix build` command.
packages.default = rocBuild.roc-cli; packages = {
default = rocBuild.roc-cli;
cli = rocBuild.roc-cli;
lang-server = rocBuild.roc-lang-server;
};
}); });
} }

0
nix/roc-cli.nix → nix/builder.nix
View file

22
nix/default.nix
View file

@ -5,12 +5,20 @@ let
cargo = rustVersion; cargo = rustVersion;
rustc = rustVersion; rustc = rustVersion;
}; };
compile-deps = pkgs.callPackage ./compile-deps.nix { };
in # this will allow our callPackage to reference our own packages defined below
{ # mainly helps with passing compile-deps and rustPlatform to builder automatically
inherit rustPlatform compile-deps; callPackage = pkgs.lib.callPackageWith (pkgs // packages);
packages = {
inherit rustPlatform;
compile-deps = callPackage ./compile-deps.nix { };
rust-shell = rust-shell =
(rustVersion.override { extensions = [ "rust-src" "rust-analyzer" ]; }); (rustVersion.override { extensions = [ "rust-src" "rust-analyzer" ]; });
roc-cli = pkgs.callPackage ./roc-cli.nix { inherit compile-deps rustPlatform; };
roc-lang-server = {}; roc-cli = callPackage ./builder.nix { }; # TODO: this builds the language server as `roc_ls`
} roc-lang-server = callPackage ./builder.nix { subPackage = "lang_srv"; };
};
in
packages