diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/dmesg.nix b/pkgs/os-specific/bsd/openbsd/pkgs/dmesg.nix index d4f9430c8b31..7ba6460d6bcd 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/dmesg.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/dmesg.nix @@ -1,9 +1,7 @@ -{ mkDerivation, libkvm }: +{ mkDerivation }: mkDerivation { path = "sbin/dmesg"; - buildInputs = [ libkvm ]; - postPatch = '' sed -i /DPADD/d $BSDSRCDIR/sbin/dmesg/Makefile ''; diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix b/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix index 7bb0516729d0..b0362f434693 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix @@ -8,6 +8,7 @@ librpcsvc, libutil, libexecinfo, + libkvm, rtld, version, }: @@ -38,6 +39,7 @@ symlinkJoin rec { librpcsvc libutil libexecinfo + libkvm ] ++ (lib.optional (!stdenvNoLibc.hostPlatform.isStatic) rtld) ); diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/libkvm.nix b/pkgs/os-specific/bsd/openbsd/pkgs/libkvm.nix index 3fe8a1b2fdd2..6fa352705b13 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/libkvm.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/libkvm.nix @@ -3,4 +3,6 @@ }: mkDerivation { path = "lib/libkvm"; + + libcMinimal = true; } diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/pkill.nix b/pkgs/os-specific/bsd/openbsd/pkgs/pkill.nix index b217de6a7b00..f54baf19c2c3 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/pkill.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/pkill.nix @@ -1,14 +1,9 @@ { mkDerivation, - libkvm, }: mkDerivation { path = "usr.bin/pkill"; - buildInputs = [ - libkvm - ]; - postPatch = '' sed -i /DPADD/d $BSDSRCDIR/usr.bin/pkill/Makefile ''; diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/ps.nix b/pkgs/os-specific/bsd/openbsd/pkgs/ps.nix index 402d86b723eb..c6afa3fe9f17 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/ps.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/ps.nix @@ -1,8 +1,7 @@ -{ mkDerivation, libkvm }: +{ mkDerivation }: mkDerivation { path = "bin/ps"; - buildInputs = [ libkvm ]; postPatch = '' sed -i /DPADD/d $BSDSRCDIR/bin/ps/Makefile ''; diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/vmstat.nix b/pkgs/os-specific/bsd/openbsd/pkgs/vmstat.nix index bc654ad650e6..6b8d54cd851d 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/vmstat.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/vmstat.nix @@ -1,8 +1,7 @@ -{ mkDerivation, libkvm }: +{ mkDerivation }: mkDerivation { path = "usr.bin/vmstat"; - buildInputs = [ libkvm ]; postPatch = '' sed -i /DPADD/d $BSDSRCDIR/usr.bin/vmstat/Makefile '';