diff options
| author | sternenseemann | 2024-09-27 11:41:25 +0200 |
|---|---|---|
| committer | sternenseemann | 2024-09-27 11:41:25 +0200 |
| commit | b341506a8d18d8d5d47ed4dbb201c8ed04b183d1 (patch) | |
| tree | aa477119c53f4d71f3cfceb0f827b92e1c13351b /pkgs/by-name/rk/rkboot/package.nix | |
| parent | b6b063bdc265990fb87781682da974578b16443c (diff) | |
| parent | fdadb5f0df5d2641c7e4494f4defc31f1e9cb8c0 (diff) | |
Merge branch master into haskell-updates
Conflicts from #341407 resolved.
Diffstat (limited to 'pkgs/by-name/rk/rkboot/package.nix')
| -rw-r--r-- | pkgs/by-name/rk/rkboot/package.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/by-name/rk/rkboot/package.nix b/pkgs/by-name/rk/rkboot/package.nix index 5cf424a43c3a..f352446e7a1b 100644 --- a/pkgs/by-name/rk/rkboot/package.nix +++ b/pkgs/by-name/rk/rkboot/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { do # The proprietary, statically linked binaries to perform boot_merge are # x86_64 only. Though we use box64 to emulate if building on aarch64-linux - ${lib.optionalString stdenv.isAarch64 "${qemu}/bin/qemu-x86_64"} ./tools/boot_merger "$i" || true + ${lib.optionalString stdenv.hostPlatform.isAarch64 "${qemu}/bin/qemu-x86_64"} ./tools/boot_merger "$i" || true done ''; |