Skip to content

Commit

Permalink
Add an option of using nix-shell instead of nix flake
Browse files Browse the repository at this point in the history
  • Loading branch information
WaffleLapkin committed Sep 21, 2024
1 parent a31ef10 commit 002a6b1
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 3 deletions.
3 changes: 0 additions & 3 deletions .envrc

This file was deleted.

8 changes: 8 additions & 0 deletions src/tools/nix-dev-shell/envrc-flake
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# If you want to use this as an .envrc file to create a shell with necessery components
# to develop rustc, use the following command in the root of the rusr checkout:
#
# ln -s ./src/tools/nix-dev-shell/envrc-flake ./.envrc && echo .envrc >> .git/info/exclude

if nix flake show path:./src/tools/nix-dev-shell &> /dev/null; then
use flake path:./src/tools/nix-dev-shell
fi
7 changes: 7 additions & 0 deletions src/tools/nix-dev-shell/envrc-shell
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# If you want to use this as an .envrc file to create a shell with necessery components
# to develop rustc, use the following command in the root of the rusr checkout:
#
# ln -s ./src/tools/nix-dev-shell/envrc-shell ./.envrc && echo .envrc >> .git/info/exclude

use nix ./src/tools/nix-dev-shell/shell.nix

19 changes: 19 additions & 0 deletions src/tools/nix-dev-shell/shell.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{ pkgs ? import <nixpkgs> {} }:
let
x = import ./x { inherit pkgs; };
in
pkgs.mkShell {
name = "rustc";
nativeBuildInputs = with pkgs; [
binutils cmake ninja pkg-config python3 git curl cacert patchelf nix
];
buildInputs = with pkgs; [
openssl glibc.out glibc.static x
];
# Avoid creating text files for ICEs.
RUSTC_ICE = "0";
# Provide `libstdc++.so.6` for the self-contained lld.
LD_LIBRARY_PATH = "${with pkgs; lib.makeLibraryPath [
stdenv.cc.cc.lib
]}";
}

0 comments on commit 002a6b1

Please sign in to comment.