From 1f84c1b6c78e8c41c76102bc79690f3a2efc99e2 Mon Sep 17 00:00:00 2001 From: AidanV <84053180+AidanV@users.noreply.github.com> Date: Fri, 10 Jan 2025 04:50:33 -0800 Subject: [PATCH] nix: Fix webrtc-sys and libstdc++ build errors in development shell (#22938) Closes #22937 - Added bzip2 package to the build inputs - Set LD_LIBRARY_PATH environment variable to stdenv.cc.cc.lib Release Notes: - N/A --- nix/shell.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nix/shell.nix b/nix/shell.nix index acdbc82ca5..69472d01fa 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -22,6 +22,7 @@ pkgs.mkShell rec { buildInputs = [ + pkgs.bzip2 pkgs.curl pkgs.fontconfig pkgs.freetype @@ -41,6 +42,8 @@ pkgs.mkShell rec { ] ++ lib.optional pkgs.stdenv.hostPlatform.isDarwin pkgs.apple-sdk_15; + LD_LIBRARY_PATH = "${pkgs.stdenv.cc.cc.lib}/lib"; + # We set SDKROOT and DEVELOPER_DIR to the Xcode ones instead of the nixpkgs ones, # because we need Swift 6.0 and nixpkgs doesn't have it. # Xcode is required for development anyways