From 3d774b445340d532d01ce968a29bf781d5459fd9 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Thu, 20 Jul 2023 22:00:13 +0300 Subject: util-linux: Fix build on non-Linux Build logs show: > configure: WARNING: non-linux system; not building mount > configure: WARNING: non-linux system; not building swapon So skip these on non-Linux Using getOutput prevents eval failures on other platforms. Things should stay eval'able with NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 Co-authored-by: Artturin --- nixos/modules/system/boot/stage-1.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/system/boot/stage-1.nix') diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 28b5592d9d7..08a10cb5edf 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -122,7 +122,7 @@ let # code, using default options and effectively ignore security relevant # ZFS properties such as `setuid=off` and `exec=off` (unless manually # duplicated in `fileSystems.*.options`, defeating "zfsutil"'s purpose). - copy_bin_and_libs ${pkgs.util-linux.mount}/bin/mount + copy_bin_and_libs ${lib.getOutput "mount" pkgs.util-linux}/bin/mount copy_bin_and_libs ${pkgs.zfs}/bin/mount.zfs ''} -- cgit 1.4.1