diff options
| author | Andrew Marshall <andrew@johnandrewmarshall.com> | 2023-07-20 22:00:13 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-07-20 22:03:15 +0300 |
| commit | 3d774b445340d532d01ce968a29bf781d5459fd9 (patch) | |
| tree | c2907241a5f41b9a31c9aa5a0df274d667752078 /nixos/modules/system/boot/stage-1.nix | |
| parent | ebcb68135f00cda38f54a52ec3ca73db26fb4d7c (diff) | |
| download | nixpkgs-3d774b445340d532d01ce968a29bf781d5459fd9.tar nixpkgs-3d774b445340d532d01ce968a29bf781d5459fd9.tar.gz nixpkgs-3d774b445340d532d01ce968a29bf781d5459fd9.tar.bz2 nixpkgs-3d774b445340d532d01ce968a29bf781d5459fd9.tar.lz nixpkgs-3d774b445340d532d01ce968a29bf781d5459fd9.tar.xz nixpkgs-3d774b445340d532d01ce968a29bf781d5459fd9.tar.zst nixpkgs-3d774b445340d532d01ce968a29bf781d5459fd9.zip | |
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 <Artturin@artturin.com>
Diffstat (limited to 'nixos/modules/system/boot/stage-1.nix')
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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 ''} |