Compare commits
4 Commits
f85b2e3d7b
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 8dde1f6b82 | |||
| e0874093f2 | |||
| 0b159fcb81 | |||
| f33eee054f |
@@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
"version": 1,
|
|
||||||
"sourceRepo": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos.git",
|
|
||||||
"sourceCommit": "398fd9e0d723c3fe7a511c2c35702874fd7342d0",
|
|
||||||
"sourcePath": "quixos-instance/quixos-nix-helpers",
|
|
||||||
"exportName": "quixos-nix-helpers",
|
|
||||||
"mirrorRemote": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-nix-helpers.git"
|
|
||||||
}
|
|
||||||
@@ -595,22 +595,12 @@ EOF
|
|||||||
installConfig.libexecName or (lib.strings.sanitizeDerivationName packageNameFinal);
|
installConfig.libexecName or (lib.strings.sanitizeDerivationName packageNameFinal);
|
||||||
serverFile = installConfig.serverFile or bundleOutfile;
|
serverFile = installConfig.serverFile or bundleOutfile;
|
||||||
descriptorPath = installConfig.descriptorPath or "descriptor.quixos-package.txtpb";
|
descriptorPath = installConfig.descriptorPath or "descriptor.quixos-package.txtpb";
|
||||||
extraFiles = installConfig.extraFiles or [ ];
|
|
||||||
installExtraFile = file:
|
|
||||||
let
|
|
||||||
source = toString file.source;
|
|
||||||
target = file.target or (baseNameOf source);
|
|
||||||
mode = file.mode or "0644";
|
|
||||||
in ''
|
|
||||||
install -Dm${toString mode} ${lib.escapeShellArg source} "$out/libexec/${serverLibexecName}/${target}"
|
|
||||||
'';
|
|
||||||
installServerPhase =
|
installServerPhase =
|
||||||
if installServer == null
|
if installServer == null
|
||||||
then null
|
then null
|
||||||
else ''
|
else ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
install -Dm755 ${lib.escapeShellArg serverFile} "$out/libexec/${serverLibexecName}/${serverFile}"
|
install -Dm755 ${lib.escapeShellArg serverFile} "$out/libexec/${serverLibexecName}/${serverFile}"
|
||||||
${lib.concatMapStringsSep "\n" installExtraFile extraFiles}
|
|
||||||
mkdir -p "$out/bin"
|
mkdir -p "$out/bin"
|
||||||
cat > "$out/bin/${serverBin}" <<EOF
|
cat > "$out/bin/${serverBin}" <<EOF
|
||||||
#!${pkgs.runtimeShell}
|
#!${pkgs.runtimeShell}
|
||||||
|
|||||||
Reference in New Issue
Block a user