diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-08 09:36:00 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-08 09:36:00 -0500 |
| commit | 6748534d83fa05cc6dee0f11bce543f7672b351f (patch) | |
| tree | a0d303182dd9e0c8ae149316270b732715e9ae64 /pkgs/applications/virtualization/qemu | |
| parent | 4f7cdd35d58e3d32ba576e218316b3c835bc508c (diff) | |
| parent | 3510b983c41196fce90729289c8c300ada1ccaea (diff) | |
| download | nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.gz nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.bz2 nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.lz nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.xz nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.zst nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/applications/virtualization/qemu')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index bb2243ca97b9..8c429ff1d062 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { postInstall = if stdenv.isx86_64 then ''makeWrapper $out/bin/qemu-system-x86_64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isi686 then ''makeWrapper $out/bin/qemu-system-i386 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' - else if stdenv.isAarch32 then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' + else if stdenv.isAarch32 then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else ""; |