about summary refs log tree commit diff
path: root/pkgs/applications/virtualization
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2022-02-01 21:14:42 +0800
committerPeter Hoeg <peter@hoeg.com>2022-02-03 11:33:38 +0800
commitc52e85672b425130b1d76ba8f08abeac02458408 (patch)
treeca2fd6d30929c01e25dc2be44db70372338fa8fa /pkgs/applications/virtualization
parent7b5b5adfcc80164e27031646c99ce87d0fd024aa (diff)
downloadnixlib-c52e85672b425130b1d76ba8f08abeac02458408.tar
nixlib-c52e85672b425130b1d76ba8f08abeac02458408.tar.gz
nixlib-c52e85672b425130b1d76ba8f08abeac02458408.tar.bz2
nixlib-c52e85672b425130b1d76ba8f08abeac02458408.tar.lz
nixlib-c52e85672b425130b1d76ba8f08abeac02458408.tar.xz
nixlib-c52e85672b425130b1d76ba8f08abeac02458408.tar.zst
nixlib-c52e85672b425130b1d76ba8f08abeac02458408.zip
qemu: remove broker wrapper script
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r--pkgs/applications/virtualization/qemu/default.nix28
1 files changed, 1 insertions, 27 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 059057bc497b..c45c519f370c 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -243,13 +243,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 = {
@@ -259,26 +253,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";