NotificationsYou must be signed in to change notification settings
Fork926
Star10.1k

Commitad02b74

authored

fix(flake.nix): fix site build & add missing inputs for darwin hosts (#16153)

- update `flake.nix`: - use `devShells.default` instead of `devShell` - include macOS-specific build inputs - use the same nodejs version in the default devShell and pnpm frontend build- update `site/.npmrc` to include tarball URLs for a reproducible Nix build.Change-Id: I28f0e301298806f251121cc93224740bcc02bcbaSigned-off-by: Thomas Kosiewski <tk@coder.com>

1 parent3e3de05 commitad02b74Copy full SHA for ad02b74

File tree

3 files changed

+1337

-1321

lines changed

flake.nix
site
- .npmrc
- pnpm-lock.yaml

3 files changed

+1337

-1321

lines changed

`‎flake.nix`

Lines changed: 22 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`inheritsystem;`
`33`	`33`	`};`
`34`	`34`
`35`		`-nodejs=pkgs.nodejs-18_x;`
	`35`	`+nodejs=pkgs.nodejs_20;`
`36`	`36`	`# Check in https://search.nixos.org/packages to find new packages.`
`37`	`37`	# Use `nix --extra-experimental-features nix-command --extra-experimental-features flakes flake update`
`38`	`38`	`# to update the lock file if packages are out-of-date.`
`@@ -88,6 +88,7 @@`
`88`	`88`	`less`
`89`	`89`	`mockgen`
`90`	`90`	`moreutils`
	`91`	`+nix-prefetch-git`
`91`	`92`	`nfpm`
`92`	`93`	`nodejs`
`93`	`94`	`neovim`
`@@ -119,9 +120,17 @@`
`119`	`120`
`120`	`121`	`# buildSite packages the site directory.`
`121`	`122`	`buildSite=pnpm2nix.packages.${system}.mkPnpmPackage{`
	`123`	`+inheritnodejs;`
	`124`	`+`
`122`	`125`	`src=./site/.;`
`123`	`126`	# Required for the `canvas` package!
`124`		`-extraBuildInputs=withpkgs;[pkgs.cairopkgs.pangopkgs.pixman];`
	`127`	`+extraBuildInputs=withpkgs;[`
	`128`	`+cairo`
	`129`	`+pango`
	`130`	`+pixman`
	`131`	`+libpnglibjpeggifliblibrsvg`
	`132`	`+python312Packages.setuptools`
	`133`	`+]++(lib.optionalsstdenv.targetPlatform.isDarwin[darwin.apple_sdk.frameworks.Foundationxcbuild]);`
`125`	`134`	`installInPlace=true;`
`126`	`135`	`distDir="out";`
`127`	`136`	`};`
`@@ -161,15 +170,18 @@`
`161`	`170`	`};`
`162`	`171`	`in`
`163`	`172`	`{`
`164`		`-devShell=pkgs.mkShell{`
`165`		`-buildInputs=devShellPackages;`
`166`		`-shellHook=''`
`167`		`- export PLAYWRIGHT_BROWSERS_PATH=${pkgs.playwright-driver.browsers}`
`168`		`- export PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true`
`169`		`- '';`
`170`		`-`
`171`		`-LOCALE_ARCHIVE=withpkgs;lib.optionalDrvAttrstdenv.isLinux"${glibcLocales}/lib/locale/locale-archive";`
	`173`	`+devShells={`
	`174`	`+default=pkgs.mkShell{`
	`175`	`+buildInputs=devShellPackages;`
	`176`	`+shellHook=''`
	`177`	`+ export PLAYWRIGHT_BROWSERS_PATH=${pkgs.playwright-driver.browsers}`
	`178`	`+ export PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true`
	`179`	`+ '';`
	`180`	`+`
	`181`	`+LOCALE_ARCHIVE=withpkgs;lib.optionalDrvAttrstdenv.isLinux"${glibcLocales}/lib/locale/locale-archive";`
	`182`	`+};`
`172`	`183`	`};`
	`184`	`+`
`173`	`185`	`packages={`
`174`	`186`	`proto_gen_go=proto_gen_go_1_30;`
`175`	`187`	`all=pkgs.buildEnv{`

`‎site/.npmrc`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,5 @@`
`1`	`1`	`save-exact=true`
`2`	`2`	`engine-strict=true`
	`3`	`+`
	`4`	`+# Needed for nix builds of the site; see: https://github.com/nzbr/pnpm2nix-nzbr/issues/33#issuecomment-2381628294`
	`5`	`+lockfile-include-tarball-url=true`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitad02b74

File tree

3 files changed

3 files changed

`‎flake.nix`

`‎site/.npmrc`

0 commit comments