Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(nix): update flake lock and move devShell to nix folder #163

Merged
merged 1 commit into from
Jul 7, 2024
Merged

chore(nix): update flake lock and move devShell to nix folder #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

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

21 changes: 1 addition & 20 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,7 @@
funzzyNightly = pkgs.copkgs.funzzyNightly;
};

devShells."${system}".default = pkgs.mkShell {
packages = with pkgs; [
rustc
cargo
rustfmt

libiconv

# For development install latest version of funzzy
copkgs.funzzyNightly

# if system contains "darwin" then darwin.apple_sdk.frameworks.CoreServices else null
# Fix error: `ld: framework not found CoreServices`
(if system == "x86_64-darwin" ||
system == "aarch64-darwin"
then darwin.apple_sdk.frameworks.CoreServices
else null
)
];
};
devShells."${system}".default = import ./nix/development-environment.nix { inherit pkgs; };
}
) systems;
in
Expand Down
19 changes: 19 additions & 0 deletions nix/development-environment.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{ pkgs }:
pkgs.mkShell {
packages = with pkgs; [
rustc
cargo
rustfmt

# For development install latest version of funzzy
copkgs.funzzyNightly

# if system contains "darwin" then darwin.apple_sdk.frameworks.CoreServices else null
# Fix error: `ld: framework not found CoreServices`
(if system == "x86_64-darwin" ||
system == "aarch64-darwin"
then darwin.apple_sdk.frameworks.CoreServices
else null
)
];
}
Loading