Skip to content

Commit

Permalink
tmp
Browse files Browse the repository at this point in the history
  • Loading branch information
TheButlah committed Nov 19, 2024
1 parent 5019ec7 commit dae13f0
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 7 deletions.
41 changes: 41 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
url = "github:nix-community/nixos-generators/7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565";
inputs.nixpkgs.follows = "nixpkgs";
};
deploy-rs = {
url = "github:serokell/deploy-rs";
inputs.nixpkgs.follows = "nixpkgs";
inputs.utils.follows = "flake-utils";
};

# Replaces the need to have a git submodule.
seekSdk = {
Expand Down
2 changes: 1 addition & 1 deletion nix/shells/development.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ let
in
{
# Everything in here becomes your shell (nix develop)
devShells.default = p.native.mkShell
default = p.native.mkShell
{
# Nix makes the following list of dependencies available to the development
# environment.
Expand Down
12 changes: 6 additions & 6 deletions nix/shells/flake-outputs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@
# It gets directly combined with the the toplevel flake.nix
{ inputs, instantiatedPkgs }:
let
inherit (inputs) flake-utils seekSdk fenix;
inherit (inputs) flake-utils seekSdk fenix deploy-rs;
tegraBashFHS = import ./tegra-bash.nix { pkgs = instantiatedPkgs.x86_64-linux; };
in
# This helper function is used to more easily abstract
# over the host platform.
# See https://github.com/numtide/flake-utils#eachdefaultsystem--system---attrs
{
# Used like a dev shell, but only for flashing.
apps."x86_64-linux"."tegra-bash" = { type = "app"; program = "${tegraBashFHS}/bin/tegra-bash"; };
} //
# This helper function is used to more easily abstract
# over the host platform.
# See https://github.com/numtide/flake-utils#eachdefaultsystem--system---attrs
flake-utils.lib.eachDefaultSystem
(system:
let
nativePkgs = instantiatedPkgs.${system};
mainShell = import ./development.nix { inherit system fenix instantiatedPkgs seekSdk; };
in
mainShell //
{
devShells = import ./development.nix { inherit system fenix instantiatedPkgs seekSdk; };
# Lets you type `nix fmt` to format the flake.
formatter = nativePkgs.nixpkgs-fmt;
packages.deploy-rs = deploy-rs.packages.${system}.deploy-rs;
}
)

0 comments on commit dae13f0

Please sign in to comment.