diff --git a/quixos-package-helpers.nix b/quixos-package-helpers.nix index faae742..c042e22 100644 --- a/quixos-package-helpers.nix +++ b/quixos-package-helpers.nix @@ -40,7 +40,7 @@ let if match2 == null then null else builtins.elemAt match2 0; schemaBase = - (pkgs.callPackage "${schemaDir}/yarn-project.gen.nix" { + (pkgs.callPackage "${schemaDir}/yarn-project.nix" { inherit nodejs git; }) { @@ -276,7 +276,7 @@ let packageName = packageJson.name or "quixos-package"; base = - (pkgs.callPackage "${srcDir}/yarn-project.gen.nix" { + (pkgs.callPackage "${srcDir}/yarn-project.nix" { nodejs = nodejs'; git = git'; }) @@ -628,7 +628,7 @@ let resources = bindingConfig.resources or [ ]; }); bindingOutput = - if bindingConfig == null then "src/gen/qx.gen.ts" else bindingConfig.output or "src/gen/qx.gen.ts"; + if bindingConfig == null then "src/gen/qx.ts" else bindingConfig.output or "src/gen/qx.ts"; authoringCheck = builtins.fromJSON (builtins.readFile "${packageRoot}/quixos.check.json"); bindingOptionsFile = if bindingConfig == null then @@ -709,7 +709,7 @@ let serverLibexecName = installConfig.libexecName or (lib.strings.sanitizeDerivationName packageNameFinal); serverFile = installConfig.serverFile or bundleOutfile; - descriptorPath = installConfig.descriptorPath or "descriptor.quixos-package.gen.txtpb"; + descriptorPath = installConfig.descriptorPath or "descriptor.quixos-package.txtpb"; extraFiles = installConfig.extraFiles or [ ]; installExtraFile = file: @@ -752,7 +752,7 @@ let runHook postInstall ''; - project = (pkgs.callPackage "${packageRoot}/yarn-project.gen.nix" { inherit nodejs; }) { + project = (pkgs.callPackage "${packageRoot}/yarn-project.nix" { inherit nodejs; }) { src = packageRoot; overrideAttrs = old: