quickshell/quickshell-web
3
1
Fork 0
Code Issues Projects Activity

Compare commits

base: quickshell:c8cd2ec70e53e36a88989f0f848191615b81ae14
Branches Tags
quickshell:main
...
compare: quickshell:8fb1408bb44cd3ae900eb7729430a6be11ac7efc
Branches Tags
quickshell:main

2 commits
c8cd2ec70e ... 8fb1408bb4

Author SHA1 Message Date
outfoxxed
8fb1408bb4
use nodejs_22 in nix files 2024-10-24 19:15:40 -07:00
outfoxxed
3641ce9277
throw error if modules path is unspecified 2024-10-24 19:14:46 -07:00
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
default.nix
View file

@ -4,7 +4,7 @@
nix-gitignore,
yarn-berry,
nodejs,
nodejs_22,
cacert,
}: stdenv.mkDerivation (final: let
nodeModules = stdenv.mkDerivation {
@ -13,7 +13,7 @@
src = final.src;
nativeBuildInputs = [ nodejs yarn-berry cacert ];
nativeBuildInputs = [ nodejs_22 yarn-berry cacert ];
configurePhase = ''
mkdir garbage-tooling
@ -33,7 +33,7 @@
HOME=$(pwd)/garbage-tooling yarn install || true
mkdir -p node_modules/node/bin
ln -s ${nodejs}/bin/node node_modules/node/bin/node
ln -s ${nodejs_22}/bin/node node_modules/node/bin/node
HOME=$(pwd)/garbage-tooling yarn install
'';

2
shell.nix
View file

@ -8,7 +8,7 @@
set -x
yarn install || true
mkdir -p node_modules/node/bin
ln -sf ${pkgs.nodejs}/bin/node node_modules/node/bin/node
ln -sf ${pkgs.nodejs_22}/bin/node node_modules/node/bin/node
yarn install
'') ];

4
src/config/io/generateTypeData.ts
View file

@ -33,6 +33,10 @@ async function readSubdir(subdir: string): Promise<dirData[]> {
export async function generateTypeData(): Promise<RouteData[]> {
const mainDir = import.meta.env.SECRET_MODULES_PATH;
if (!mainDir || mainDir == "") {
throw new Error("Cannot generate types, missing SECRET_MODULES_PATH");
}
const subdirs = await fs.readdir(mainDir, {
withFileTypes: true,
});