networkd-dispatcher: remove unused configparser, use installManPage and --replace-fail

This commit is contained in:
Sandro Jäckel 2025-04-07 13:51:20 +02:00
parent 676f1c9b6e
commit 492b3f330f
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5

View file

@ -3,6 +3,7 @@
stdenv, stdenv,
fetchFromGitLab, fetchFromGitLab,
fetchpatch, fetchpatch,
installShellFiles,
python3Packages, python3Packages,
asciidoc, asciidoc,
wrapGAppsNoGuiHook, wrapGAppsNoGuiHook,
@ -36,13 +37,14 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
# Fix paths in systemd unit file # Fix paths in systemd unit file
substituteInPlace networkd-dispatcher.service \ substituteInPlace networkd-dispatcher.service \
--replace "/usr/bin/networkd-dispatcher" "$out/bin/networkd-dispatcher" --replace-fail "/usr/bin/networkd-dispatcher" "$out/bin/networkd-dispatcher"
# Remove conditions on existing rules path # Remove conditions on existing rules path
sed -i '/ConditionPathExistsGlob/g' networkd-dispatcher.service sed -i '/ConditionPathExistsGlob/g' networkd-dispatcher.service
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
asciidoc asciidoc # for a2x
installShellFiles
wrapGAppsNoGuiHook wrapGAppsNoGuiHook
python3Packages.wrapPython python3Packages.wrapPython
]; ];
@ -58,7 +60,6 @@ stdenv.mkDerivation rec {
]; ];
pythonPath = with python3Packages; [ pythonPath = with python3Packages; [
configparser
dbus-python dbus-python
pygobject3 pygobject3
]; ];
@ -68,7 +69,7 @@ stdenv.mkDerivation rec {
install -D -m755 -t $out/bin networkd-dispatcher install -D -m755 -t $out/bin networkd-dispatcher
install -Dm644 networkd-dispatcher.service $out/lib/systemd/system/networkd-dispatcher.service install -Dm644 networkd-dispatcher.service $out/lib/systemd/system/networkd-dispatcher.service
install -Dm644 networkd-dispatcher.conf $out/etc/conf.d/networkd-dispatcher.conf install -Dm644 networkd-dispatcher.conf $out/etc/conf.d/networkd-dispatcher.conf
install -D networkd-dispatcher.8 -t $out/share/man/man8/ installManPage networkd-dispatcher.8
runHook postInstall runHook postInstall
''; '';