mempool: minor refactorings
- Use `sourceRoot` - Allow `generate.sh` to directly trigger the build of `nodeModules`. Needed by mempool 3.2.1, where `mempool-backend` has multiple fixed output derivation dependencies, which can only be updated if they can be built directly.
This commit is contained in:
parent
c48b99782d
commit
d61099a535
2 changed files with 8 additions and 4 deletions
|
|
@ -26,12 +26,12 @@ rec {
|
|||
nodeModules = {
|
||||
frontend = fetchNodeModules {
|
||||
inherit src nodejs;
|
||||
preBuild = "cd frontend";
|
||||
sourceRoot = "source/frontend";
|
||||
hash = "sha256-/Z0xNvob7eMGpzdUWolr47vljpFiIutZpGwd0uYhPWI=";
|
||||
};
|
||||
backend = fetchNodeModules {
|
||||
inherit src nodejs;
|
||||
preBuild = "cd backend";
|
||||
sourceRoot = "source/backend";
|
||||
hash = "sha256-HpzzSTuSRWDWGbctVhTcUA01if/7OTI4xN3DAbAAX+U=";
|
||||
};
|
||||
};
|
||||
|
|
@ -67,6 +67,7 @@ rec {
|
|||
|
||||
passthru = {
|
||||
inherit nodejs nodejsRuntime;
|
||||
nodeModules = nodeModules.backend;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -99,7 +100,10 @@ rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = { assets = frontendAssets; };
|
||||
passthru = {
|
||||
assets = frontendAssets;
|
||||
nodeModules = nodeModules.frontend;
|
||||
};
|
||||
};
|
||||
|
||||
mempool-nginx-conf = runCommand "mempool-nginx-conf" {} ''
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ updateNodeModulesHash() {
|
|||
component=$1
|
||||
echo
|
||||
echo "Fetching node modules for mempool-$component"
|
||||
../../helper/update-fixed-output-derivation.sh ./default.nix mempool-"$component" "cd $component"
|
||||
../../helper/update-fixed-output-derivation.sh ./default.nix mempool-"$component".nodeModules "sourceRoot.*$component"
|
||||
}
|
||||
|
||||
updateFrontendAssets() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue