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

Compare commits

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

No commits in common. "8fb1408bb44cd3ae900eb7729430a6be11ac7efc" and "c8cd2ec70e53e36a88989f0f848191615b81ae14" have entirely different histories.
8fb1408bb4 ... c8cd2ec70e

3 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
default.nix
View file

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

2
shell.nix
View file

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

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

@ -33,10 +33,6 @@ async function readSubdir(subdir: string): Promise<dirData[]> {
export async function generateTypeData(): Promise<RouteData[]> { export async function generateTypeData(): Promise<RouteData[]> {
const mainDir = import.meta.env.SECRET_MODULES_PATH; 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, { const subdirs = await fs.readdir(mainDir, {
withFileTypes: true, withFileTypes: true,
}); });