From 4c4c637f7467bf60eea2d283edaf438ead5fcc31 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 5 Apr 2021 11:30:50 +0200 Subject: Update shell.nix Signed-off-by: Matthias Beyer --- shell.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'shell.nix') diff --git a/shell.nix b/shell.nix index 01160ab..f496c89 100644 --- a/shell.nix +++ b/shell.nix @@ -1,9 +1,17 @@ -{ pkgs ? (import {}) }: +{ ... }: let - env = with pkgs.rustChannels.stable; [ - rust - cargo + moz_overlay = import ( + builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz + ); + + pkgs = import { overlays = [ moz_overlay ]; }; + + env = with pkgs; [ + rustChannels.stable.rust-std + rustChannels.stable.rust + rustChannels.stable.rustc + rustChannels.stable.cargo ]; dependencies = with pkgs; [ @@ -17,11 +25,12 @@ let zlib dbus libtool + protobuf ]; in pkgs.mkShell rec { buildInputs = env ++ dependencies; LIBCLANG_PATH = "${pkgs.llvmPackages.libclang}/lib"; + PROTOC = "${pkgs.protobuf}/bin/protoc"; } - -- cgit v1.2.3