rename notificationFd to notification-fd
it's perfectly valid syntax and consistent with the s6 spelling
This commit is contained in:
parent
08bed15cf8
commit
5427456c21
2 changed files with 2 additions and 4 deletions
|
@ -11,10 +11,9 @@ test -n "$contents" && for d in $contents; do
|
||||||
touch $out/${name}/contents.d/$d
|
touch $out/${name}/contents.d/$d
|
||||||
done
|
done
|
||||||
test -n "$run" && (echo -e "$run" > $out/${name}/run)
|
test -n "$run" && (echo -e "$run" > $out/${name}/run)
|
||||||
test -n "${notificationFd}" && (echo ${notificationFd} > $out/${name}/notification-fd)
|
test -n "${notification-fd}" && (echo ${notification-fd} > $out/${name}/notification-fd)
|
||||||
test -n "$up" && (echo -e "$up" > $out/${name}/up)
|
test -n "$up" && (echo -e "$up" > $out/${name}/up)
|
||||||
test -n "$down" && (echo -e "$down" > $out/${name}/down)
|
test -n "$down" && (echo -e "$down" > $out/${name}/down)
|
||||||
( cd $out && ln -s /run/service-state/${name} ./.outputs )
|
( cd $out && ln -s /run/service-state/${name} ./.outputs )
|
||||||
for i in $out/${name}/{down,up,run} ; do test -f $i && chmod +x $i; done
|
for i in $out/${name}/{down,up,run} ; do test -f $i && chmod +x $i; done
|
||||||
true
|
true
|
||||||
# (echo $out/${name} && cd $out/${name} && find . -ls)
|
|
||||||
|
|
|
@ -28,11 +28,10 @@ let
|
||||||
} @ args: stdenvNoCC.mkDerivation {
|
} @ args: stdenvNoCC.mkDerivation {
|
||||||
# we use stdenvNoCC to avoid generating derivations with names
|
# we use stdenvNoCC to avoid generating derivations with names
|
||||||
# like foo.service-mips-linux-musl
|
# like foo.service-mips-linux-musl
|
||||||
inherit name serviceType up down run;
|
inherit name serviceType up down run notification-fd;
|
||||||
buildInputs = dependencies ++ contents;
|
buildInputs = dependencies ++ contents;
|
||||||
dependencies = builtins.map (d: d.name) dependencies;
|
dependencies = builtins.map (d: d.name) dependencies;
|
||||||
contents = builtins.map (d: d.name) contents;
|
contents = builtins.map (d: d.name) contents;
|
||||||
notificationFd = notification-fd;
|
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue