Skip to content

INF-824: Fix cargo build in nix-shell #329

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

Merged
mergify merged 3 commits into from
Jan 22, 2020
Merged

INF-824: Fix cargo build in nix-shell #329

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae54a45
INF-824: Make sure bash is used in cmake wrapper
nmattia Jan 20, 2020
a810cab
INF-824: don't import stdenv.cc in dfx shell
nmattia Jan 20, 2020
3bb5790
Merge branch 'master' into nm-cmake-bash
mergify[bot] Jan 22, 2020
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
1 change: 0 additions & 1 deletion nix/rust-shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
pkgs.mkCompositeShell {
name = "dfinity-sdk-rust-env";
buildInputs = [ pkgs.rls ];
nativeBuildInputs = [ pkgs.stdenv.cc ];
inputsFrom = [ shell ];
shellHook = ''
# Set CARGO_HOME to minimize interaction with any environment outside nix
Expand Down
2 changes: 1 addition & 1 deletion nix/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"common": {
"ref": "master",
"repo": "ssh://git@github.com/dfinity-lab/common",
"rev": "8c07b4a592e7c54ff43adf0420575d4069bfe8a9",
"rev": "233f63f23f0a207f291693fc1983a92a53e28b59",
"type": "git"
},
"dfinity": {
Expand Down