roc-lang/roc
1
1
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2024-08-16 14:20:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
default.nix
View File

@ -7,4 +7,4 @@
}
)
{ src = ./.; }
).defaultNix
).defaultNix

12
flake.nix
View File

@ -34,8 +34,8 @@
rocBuild = import ./nix { inherit pkgs; };
compile-deps = rocBuild.compile-deps;
inherit (compile-deps) zigPkg llvmPkgs llvmVersion
llvmMajorMinorStr glibcPath libGccSPath darwinInputs;
inherit (compile-deps) zigPkg llvmPkgs llvmVersion
llvmMajorMinorStr glibcPath libGccSPath darwinInputs;
# DevInputs are not necessary to build roc as a user
linuxDevInputs = with pkgs;
@ -155,6 +155,12 @@
formatter = pkgs.nixpkgs-fmt;
# 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

24
nix/default.nix
View File

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