Shell.nix cleanup.

This commit is contained in:
Thomas Hartmann 2019-10-11 21:13:00 +02:00
parent f0ca0312f3
commit af2ec60980

View file

@ -1,25 +1,32 @@
{ pkgs ? import <nixpkgs> {
overlays = [
(import (builtins.fetchTarball
"https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz"))
];
} }:
with pkgs;
let let
moz_overlay = import (builtins.fetchTarball
"https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz");
nixpkgs = import <nixpkgs> { overlays = [ moz_overlay ]; }; nightly = ((pkgs.rustChannelOf {
nightly = ((nixpkgs.rustChannelOf {
date = "2019-09-01"; date = "2019-09-01";
channel = "nightly"; channel = "nightly";
}).rust.override { }).rust.override {
extensions = [ extensions = [
"rust-src"
"rls-preview"
"clippy-preview" "clippy-preview"
"rls-preview"
"rust-analysis" "rust-analysis"
"rust-src"
"rustfmt-preview" "rustfmt-preview"
]; ];
}); });
in with nixpkgs; nu-deps = [ openssl_1_1 pkg-config x11 python3 ];
stdenv.mkDerivation {
rust = [ nightly rustracer cargo-watch ];
in stdenv.mkDerivation {
name = "nushell-rust"; name = "nushell-rust";
buildInputs = [ nightly openssl_1_1 pkg-config rustracer ]; buildInputs = nu-deps ++ rust;
RUST_SRC_PATH = "${nightly}/lib/rustlib/src/rust/src"; RUST_SRC_PATH = "${nightly}/lib/rustlib/src/rust/src";
SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
} }