diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-03 21:29:24 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-03 21:29:24 -0800 |
| commit | 9a16965c751b90e2674ba8bb8ec25582cf631f29 (patch) | |
| tree | cca818753e0db7af49db0e3e33dbfd4d86f9dbf7 /pkgs/applications/virtualization/qemu | |
| parent | 3b8270ac54b9e1892e5ed465ac01a61cd575863f (diff) | |
| parent | 2d666e4bf69a81a731f87a06aa54e3dd1dde217d (diff) | |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
pkgs/development/python-modules/awesomeversion/default.nix
pkgs/development/python-modules/md2gemini/default.nix
pkgs/development/python-modules/mill-local/default.nix
pkgs/development/python-modules/pyatv/default.nix
pkgs/development/python-modules/pyezviz/default.nix
pkgs/development/python-modules/pyinsteon/default.nix
pkgs/development/python-modules/pylitterbot/default.nix
pkgs/development/python-modules/pynuki/default.nix
pkgs/development/python-modules/pypck/default.nix
pkgs/development/python-modules/types-requests/default.nix
pkgs/top-level/aliases.nix
Diffstat (limited to 'pkgs/applications/virtualization/qemu')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 4ff96a973e57..2ae0aca5845e 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -184,13 +184,7 @@ stdenv.mkDerivation rec { # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. postInstall = '' - install -m755 -D $emitKvmWarningsPath $out/libexec/emit-kvm-warnings - if [ -x $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} ]; then - makeWrapper $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} \ - $out/bin/qemu-kvm \ - --run $out/libexec/emit-kvm-warnings \ - --add-flags "\$([ -r /dev/kvm -a -w /dev/kvm ] && echo -enable-kvm)" - fi + ln -s $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} $out/bin/qemu-kvm ''; passthru = { @@ -200,26 +194,6 @@ stdenv.mkDerivation rec { # Builds in ~3h with 2 cores, and ~20m with a big-parallel builder. requiredSystemFeatures = [ "big-parallel" ]; - emitKvmWarnings = '' - #!${runtimeShell} - WARNCOL='\033[1;35m' - NEUTRALCOL='\033[0m' - WARNING="''${WARNCOL}warning:''${NEUTRALCOL}" - if [ ! -e /dev/kvm ]; then - echo -e "''${WARNING} KVM is not available - execution will be slow" >&2 - echo "Consider installing KVM for hardware-accelerated execution." >&2 - echo "If KVM is already installed make sure the kernel module is loaded." >&2 - elif [ ! -r /dev/kvm -o ! -w /dev/kvm ]; then - echo -e "''${WARNING} /dev/kvm is not read-/writable - execution will be slow" >&2 - echo "/dev/kvm needs to be read-/writable by the user executing QEMU." >&2 - echo "" >&2 - echo "For hardware-acceleration inside the nix build sandbox /dev/kvm" >&2 - echo "must be world-read-/writable (rw-rw-rw-)." >&2 - fi - ''; - - passAsFile = [ "emitKvmWarnings" ]; - meta = with lib; { homepage = "http://www.qemu.org/"; description = "A generic and open source machine emulator and virtualizer"; |