From e08317b18d899402db370f6d8a7c16baf2f68be7 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 6 Jan 2025 00:14:39 +0000 Subject: [PATCH 1/3] openbsd.reboot: init --- pkgs/os-specific/bsd/openbsd/pkgs/reboot.nix | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/reboot.nix diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/reboot.nix b/pkgs/os-specific/bsd/openbsd/pkgs/reboot.nix new file mode 100644 index 000000000000..946f8427b87a --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/pkgs/reboot.nix @@ -0,0 +1,4 @@ +{ mkDerivation }: +mkDerivation { + path = "sbin/reboot"; +} From f3f5493bce5467e1c22b664d94ca38f85509b6cf Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 6 Jan 2025 00:17:10 +0000 Subject: [PATCH 2/3] openbsd.wall: init --- pkgs/os-specific/bsd/openbsd/pkgs/wall.nix | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/wall.nix diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/wall.nix b/pkgs/os-specific/bsd/openbsd/pkgs/wall.nix new file mode 100644 index 000000000000..a579efb9a8d5 --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/pkgs/wall.nix @@ -0,0 +1,9 @@ +{ mkDerivation }: +mkDerivation { + path = "usr.bin/wall"; + + postPatch = '' + sed -i /BINMODE/d $BSDSRCDIR/usr.bin/wall/Makefile + sed -i /BINGRP/d $BSDSRCDIR/usr.bin/wall/Makefile + ''; +} From cd0f0637025118e47c9b2db9eb6eb765c23a2372 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 6 Jan 2025 00:21:21 +0000 Subject: [PATCH 3/3] openbsd.shutdown: Set paths for halt, reboot, wall --- pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix b/pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix index 15c602455866..7dd7125a8823 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix @@ -1,8 +1,17 @@ -{ mkDerivation }: +{ + mkDerivation, + reboot, + wall, +}: mkDerivation { path = "sbin/shutdown"; - preBuild = '' - sed -i 's/4550/0550/' Makefile + postPatch = '' + sed -i 's/4550/0550/' $BSDSRCDIR/sbin/shutdown/Makefile + + substituteInPlace $BSDSRCDIR/sbin/shutdown/pathnames.h \ + --replace-fail /sbin/halt ${reboot}/bin/halt \ + --replace-fail /sbin/reboot ${reboot}/bin/reboot \ + --replace-fail /usr/bin/wall ${wall}/bin/wall ''; }