From 58e0732fb33cdf8215f77740ccd16ae117259aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 3 Dec 2024 22:26:55 +0100 Subject: [PATCH] hwinfo: split lib from bin output bin currently depends on perl, which is a big dependency for `nixos-facter` --- pkgs/by-name/hw/hwinfo/package.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/by-name/hw/hwinfo/package.nix b/pkgs/by-name/hw/hwinfo/package.nix index cfb940d66cd1..15a20ebd10a8 100644 --- a/pkgs/by-name/hw/hwinfo/package.nix +++ b/pkgs/by-name/hw/hwinfo/package.nix @@ -69,6 +69,13 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs src/ids/convert_hd ''; + outputs = [ + "bin" + "dev" + "lib" + "out" + ]; + # The pci/usb ids in hwinfo are ancient. We can get a more up-to-date list simply by copying from systemd preBuild = '' # since we don't have .git, we cannot run this. @@ -94,6 +101,13 @@ stdenv.mkDerivation (finalAttrs: { ]; installFlags = [ "DESTDIR=$(out)" ]; + enableParallelBuilding = false; # broken parallel dependencies + + postInstall = '' + moveToOutput bin "$bin" + moveToOutput lib "$lib" + ''; + passthru = { tests = { version = testers.testVersion { package = finalAttrs.finalPackage; };