diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-04-09 17:29:04 +0000 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2022-04-10 08:11:46 +0800 |
| commit | 665bb90fc3f6c39cfb290ecc100b3433082e5d64 (patch) | |
| tree | 546f13267a3d08c9bbc53cdea2b93657021b786c /pkgs/applications/virtualization/qemu/default.nix | |
| parent | 797fdd3859263cf6564d98c466ce8c46be52d87b (diff) | |
| download | nixlib-665bb90fc3f6c39cfb290ecc100b3433082e5d64.tar nixlib-665bb90fc3f6c39cfb290ecc100b3433082e5d64.tar.gz nixlib-665bb90fc3f6c39cfb290ecc100b3433082e5d64.tar.bz2 nixlib-665bb90fc3f6c39cfb290ecc100b3433082e5d64.tar.lz nixlib-665bb90fc3f6c39cfb290ecc100b3433082e5d64.tar.xz nixlib-665bb90fc3f6c39cfb290ecc100b3433082e5d64.tar.zst nixlib-665bb90fc3f6c39cfb290ecc100b3433082e5d64.zip | |
qemu: remove redundant copy of qemu-ga
There's no reason to have one copy of qemu-ga in $out and another in $ga, and because we only applied remove-references-to to one of the copies, it caused a collision when QEMU was used in a buildEnv.
Diffstat (limited to 'pkgs/applications/virtualization/qemu/default.nix')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 954fd3f051a9..68082f5de41b 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -234,9 +234,10 @@ stdenv.mkDerivation rec { # the .desktop is both invalid and pointless rm -f $out/share/applications/qemu.desktop - # copy qemu-ga (guest agent) to separate output + # move qemu-ga (guest agent) to separate output mkdir -p $ga/bin - cp $out/bin/qemu-ga $ga/bin/ + mv $out/bin/qemu-ga $ga/bin/ + ln -s $ga/bin/qemu-ga $out/bin remove-references-to -t $out $ga/bin/qemu-ga '' + lib.optionalString gtkSupport '' # wrap GTK Binaries |