diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-12-02 14:52:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-12-02 14:52:44 +0000 |
| commit | f404068903e20a01f4e231f1ca63f4828c61bb42 (patch) | |
| tree | 6d4a41929bedbad233b5964a91fa016e4ec3daff /pkgs/applications/virtualization/qemu | |
| parent | cfa9a0cbe60f9c2a6c7daf482be103aab56913ad (diff) | |
| parent | a68e0fdca5a5ac73be0b19cd6d22432287afd8bc (diff) | |
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts: pkgs/servers/search/groonga/default.nix
Diffstat (limited to 'pkgs/applications/virtualization/qemu')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 875318e762ead..c183196bed743 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -229,8 +229,7 @@ stdenv.mkDerivation rec { # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. postInstall = '' - cp -- $emitKvmWarningsPath $out/libexec/emit-kvm-warnings - chmod a+x -- $out/libexec/emit-kvm-warnings + 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 \ |