diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-11-21 20:26:51 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-11-21 21:44:29 +0000 |
| commit | a0262a08026c7e8fe7ed8acde33b729e73e43208 (patch) | |
| tree | 84966ba0c3800e3ba26428c8d75d45db8536b508 /pkgs/applications/virtualization | |
| parent | bea767e5fee7cdf9ab6a3005dfeb84f1ef4b729f (diff) | |
| download | nixpkgs-a0262a08026c7e8fe7ed8acde33b729e73e43208.tar nixpkgs-a0262a08026c7e8fe7ed8acde33b729e73e43208.tar.gz nixpkgs-a0262a08026c7e8fe7ed8acde33b729e73e43208.tar.bz2 nixpkgs-a0262a08026c7e8fe7ed8acde33b729e73e43208.tar.lz nixpkgs-a0262a08026c7e8fe7ed8acde33b729e73e43208.tar.xz nixpkgs-a0262a08026c7e8fe7ed8acde33b729e73e43208.tar.zst nixpkgs-a0262a08026c7e8fe7ed8acde33b729e73e43208.zip | |
qemu: enable debug info
I dropped autoPatchelfHook because it got confused with the debug
objects, and I can't reproduce the pixman linker errors that caused it
to be introduced in #106988 ("qemu: 5.1.0 -> 5.2.0").
Diffstat (limited to 'pkgs/applications/virtualization')
| -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 9d2b227dcbb..4a502b2594a 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, python, zlib, pkg-config, glib , perl, pixman, vde2, alsa-lib, texinfo, flex , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool -, makeWrapper, autoPatchelfHook +, makeWrapper , attr, libcap, libcap_ng , CoreServices, Cocoa, Hypervisor, rez, setfile , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl @@ -53,7 +53,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper python python.pkgs.sphinx python.pkgs.sphinx_rtd_theme pkg-config flex bison meson ninja ] ++ lib.optionals gtkSupport [ wrapGAppsHook ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; buildInputs = [ zlib glib perl pixman @@ -84,6 +83,7 @@ stdenv.mkDerivation rec { dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build outputs = [ "out" "ga" ]; + separateDebugInfo = true; patches = [ ./fix-qemu-ga.patch @@ -167,6 +167,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--audio-drv-list=${audio}" + "--disable-strip" # We'll strip ourselves after separating debug info. "--enable-docs" "--enable-tools" "--enable-guest-agent" |