Merge pull request #313227 from emilylange/forgejo-fixup
forgejo: remove no longer needed preBuild phase (noop)
This commit is contained in:
commit
6cde993235
@ -80,10 +80,6 @@ buildGoModule rec {
|
|||||||
export ldflags+=" -X main.ForgejoVersion=$(GITEA_VERSION=${version} make show-version-api)"
|
export ldflags+=" -X main.ForgejoVersion=$(GITEA_VERSION=${version} make show-version-api)"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preBuild = ''
|
|
||||||
go run build/merge-forgejo-locales.go
|
|
||||||
'';
|
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
mkdir $data
|
mkdir $data
|
||||||
cp -R ./{templates,options} ${frontend}/public $data
|
cp -R ./{templates,options} ${frontend}/public $data
|
||||||
@ -93,10 +89,9 @@ buildGoModule rec {
|
|||||||
--prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]}
|
--prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# $data is not available in goModules.drv and preBuild isn't needed
|
# $data is not available in goModules.drv
|
||||||
overrideModAttrs = (_: {
|
overrideModAttrs = (_: {
|
||||||
postPatch = null;
|
postPatch = null;
|
||||||
preBuild = null;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
|
Loading…
Reference in New Issue
Block a user