Commit1275610

committed

fix(flake.nix): Install locales on linux host devShells

Change-Id: I22dba63d317b41749c807a55e15278006cdcecadSigned-off-by: Thomas Kosiewski <tk@coder.com>

1 parent8f02e63 commit1275610Copy full SHA for 1275610

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# Build stage`
`2`		`-FROMnixos/nix:2.19.2asnix`
	`2`	`+FROMnixos/nix:2.19.2ASnix`
`3`	`3`
`4`	`4`	`# enable --experimental-features 'nix-command flakes' globally`
`5`	`5`	`# nix does not enable these features by default these are required to run commands like`
`@@ -14,7 +14,7 @@ RUN nix profile install "/app#all" --priority 4 && \`
`14`	`14`	`nix-collect-garbage-d`
`15`	`15`
`16`	`16`	`# Final image`
`17`		`-FROMcodercom/enterprise-base:latestasfinal`
	`17`	`+FROMcodercom/enterprise-base:latestASfinal`
`18`	`18`
`19`	`19`	`# Set the non-root user`
`20`	`20`	`USERroot`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,17 +61,19 @@`
`61`	`61`	`# google-chrome is not available on OSX and aarch64 linux`
`62`	`62`	`(ifpkgs.stdenv.hostPlatform.isDarwin\|\|pkgs.stdenv.hostPlatform.isAarch64thennullelsegoogle-chrome)`
`63`	`63`	`# strace is not available on OSX`
`64`		`-(ifpkgs.stdenv.hostPlatform.isDarwinthennullelsestrace)`
	`64`	`+(lib.optionalDrvAttr(!pkgs.stdenv.isDarwin)strace)`
`65`	`65`	`bat`
`66`	`66`	`cairo`
`67`	`67`	`curl`
`68`	`68`	`delve`
`69`	`69`	`drpc.defaultPackage.${system}`
	`70`	`+fzf`
`70`	`71`	`gcc`
`71`	`72`	`gdk`
`72`	`73`	`getopt`
`73`	`74`	`gh`
`74`	`75`	`git`
	`76`	`+(lib.optionalDrvAttrstdenv.isLinuxglibcLocales)`
`75`	`77`	`gnumake`
`76`	`78`	`gnused`
`77`	`79`	`go_1_22`
`@@ -87,6 +89,7 @@`
`87`	`89`	`mockgen`
`88`	`90`	`nfpm`
`89`	`91`	`nodejs`
	`92`	`+neovim`
`90`	`93`	`pnpm`
`91`	`94`	`openssh`
`92`	`95`	`openssl`
`@@ -98,8 +101,6 @@`
`98`	`101`	`protobuf`
`99`	`102`	`proto_gen_go_1_30`
`100`	`103`	`ripgrep`
`101`		`-# This doesn't build on latest nixpkgs (July 10 2024)`
`102`		`-(pinnedPkgs.sapling)`
`103`	`104`	`shellcheck`
`104`	`105`	`(pinnedPkgs.shfmt)`
`105`	`106`	`sqlc`
`@@ -165,6 +166,8 @@`
`165`	`166`	`export PLAYWRIGHT_BROWSERS_PATH=${pkgs.playwright-driver.browsers}`
`166`	`167`	`export PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true`
`167`	`168`	`'';`
	`169`	`+`
	`170`	`+LOCALE_ARCHIVE=withpkgs;lib.optionalDrvAttrstdenv.isLinux"${glibcLocales}/lib/locale/locale-archive";`
`168`	`171`	`};`
`169`	`172`	`packages={`
`170`	`173`	`proto_gen_go=proto_gen_go_1_30;`

Comments

(0)