From 2abfd7d90ba2598d231e7763f0578ff900dd9b52 Mon Sep 17 00:00:00 2001 From: Sebastian Ullrich Date: Thu, 1 Aug 2019 23:12:58 +0200 Subject: [PATCH] chore(shell.nix): use clang 7 by default (latest release in stable Nix) --- shell.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shell.nix b/shell.nix index 7b8017b375..65c735b04a 100644 --- a/shell.nix +++ b/shell.nix @@ -1,11 +1,11 @@ -{ pkgs ? import {} }: +{ pkgs ? import {}, clang ? pkgs.clang_7 }: let - lean = pkgs.callPackage ./default.nix {}; + lean = pkgs.callPackage ./derivation.nix { llvm = clang.cc.llvm; }; temci = pkgs.callPackage (builtins.fetchGit { url = https://github.com/parttimenerd/temci.git; rev = "2facd7c78ab35722f34db1d42883ec02f8a0de23"; }) {}; in pkgs.mkShell rec { inputsFrom = [ lean ]; - buildInputs = with pkgs; [ temci clang_7 ccache ninja ]; + buildInputs = with pkgs; [ temci clang ccache ninja ]; # https://github.com/NixOS/nixpkgs/issues/60919 hardeningDisable = [ "all" ]; # TODO: this should not be necessary when leanc starts statically linking binaries