From e12d731fd093e9dac96def10ee67c7ad8c4ba602 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Fri, 18 Aug 2023 09:06:37 -0500 Subject: [PATCH 1/3] fix: add locale to dogfood image --- flake.nix | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index cc0f3f31b4d52..b40193eadb28a 100644 --- a/flake.nix +++ b/flake.nix @@ -109,6 +109,7 @@ # Increase memory allocation to NodeJS "NODE_OPTIONS=--max_old_space_size=8192" "TERM=xterm-256color" + "LANG=en_US.UTF-8" ]; # Builds our development environment image with all the tools included. # Using Nix instead of Docker is **significantly** faster. This _build_ @@ -179,20 +180,25 @@ (builtins.readFile "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt") ) ]; + # Required for the UTF-8 locale to exist! + extraCommands = '' + mkdir -p usr/lib/locale + cp ${pkgs.glibcLocales}/lib/locale/locale-archive usr/lib/locale/locale-archive + ''; - config = { - Env = devEnvVars; - Entrypoint = [ "/bin/bash" ]; - User = "coder"; - }; + config = { + Env = devEnvVars; + Entrypoint = [ "/bin/bash" ]; + User = "coder"; + }; }; - in - { + in + { packages = { devEnvImage = devEnvImage; }; defaultPackage = formatter; # or replace it with your desired default package. devShell = pkgs.mkShell { buildInputs = devShellPackages; }; - } - ); -} + } + ); + } From 9e74eeb6801bb989ed596931e3272ab1dce2a75b Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Fri, 18 Aug 2023 09:10:49 -0500 Subject: [PATCH 2/3] Update flake.nix Co-authored-by: Mathias Fredriksson --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index b40193eadb28a..90591cf3471b2 100644 --- a/flake.nix +++ b/flake.nix @@ -183,7 +183,7 @@ # Required for the UTF-8 locale to exist! extraCommands = '' mkdir -p usr/lib/locale - cp ${pkgs.glibcLocales}/lib/locale/locale-archive usr/lib/locale/locale-archive + cp -a ${pkgs.glibcLocales}/lib/locale/locale-archive usr/lib/locale/locale-archive ''; config = { From 0b1ec7db829f08139a3e700446d16bf474a34b88 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Fri, 18 Aug 2023 09:11:56 -0500 Subject: [PATCH 3/3] Add gcc --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 90591cf3471b2..8f3829c6bc9ec 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,7 @@ docker drpc.defaultPackage.${system} exa + gcc getopt git gnumake