Merge pull request #89328 from flokli/qemu-wrap

qemu: wrap GTK binaries
This commit is contained in:
Florian Klink 2020-06-03 22:29:19 +02:00 committed by GitHub
commit aad06c8ff5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -8,7 +8,7 @@
, seccompSupport ? stdenv.isLinux, libseccomp
, pulseSupport ? !stdenv.isDarwin, libpulseaudio
, sdlSupport ? !stdenv.isDarwin, SDL2
, gtkSupport ? !stdenv.isDarwin && !xenSupport, gtk3, gettext, vte
, gtkSupport ? !stdenv.isDarwin && !xenSupport, gtk3, gettext, vte, wrapGAppsHook
, vncSupport ? true, libjpeg, libpng
, smartcardSupport ? true, libcacard
, spiceSupport ? !stdenv.isDarwin, spice, spice-protocol
@ -46,7 +46,8 @@ stdenv.mkDerivation rec {
sha256 = "1gczv8hn3wqci86css3mhzrppp3z8vppxw25l08j589k6bvz7x1w";
};
nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ];
nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ]
++ optionals gtkSupport [ wrapGAppsHook ];
buildInputs =
[ zlib glib ncurses perl pixman
vde2 texinfo makeWrapper lzo snappy
@ -165,12 +166,17 @@ stdenv.mkDerivation rec {
++ optional smbdSupport "--smbd=${samba}/bin/smbd";
doCheck = false; # tries to access /dev
dontWrapGApps = true;
postFixup =
''
postFixup = ''
# copy qemu-ga (guest agent) to separate output
mkdir -p $ga/bin
cp $out/bin/qemu-ga $ga/bin/
'' + optionalString gtkSupport ''
# wrap GTK Binaries
for f in $out/bin/qemu-system-*; do
wrapGApp $f
done
'';
# Add a qemu-kvm wrapper for compatibility/convenience.