From 917bb708d887cf539e395cd41c1cc148a7f7d58a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Tue, 4 Oct 2022 12:43:32 +0200 Subject: [PATCH] nix: don't pull in gcc explicitly, stdenv has it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If we pull it explicitly we affect variables like `CC_FOR_TARGET` which can break builds on MacOS due to need for `clang` use. Depends on: https://github.com/status-im/nimbus-build-system/pull/51 Signed-off-by: Jakub SokoĊ‚owski --- shell.nix | 1 - vendor/nimbus-build-system | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/shell.nix b/shell.nix index 9f3206753..1b76081fb 100644 --- a/shell.nix +++ b/shell.nix @@ -10,7 +10,6 @@ pkgs.mkShell { buildInputs = with pkgs; [ git # 2.37.3 which # 2.21 - gcc # 11.3.0 rustc # 1.63.0 ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; } diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system index c7977002f..07e37730c 160000 --- a/vendor/nimbus-build-system +++ b/vendor/nimbus-build-system @@ -1 +1 @@ -Subproject commit c7977002fb9e631a946b6589a0b7adc7dc9acef9 +Subproject commit 07e37730c627c19848e8662352976afe7e15bb1f