This was achieved using the following command:
sd 'wrapGAppsHook\b' wrapGAppsHook3 (rg -l 'wrapGAppsHook\b')
And then manually reverted the following changes:
- alias in top-level.nix
- function name in wrap-gapps-hook.sh
- comment in postFixup of at-spi2-core
- comment in gtk4
- comment in preFixup of 1password-gui/linux.nix
- comment in postFixup of qgis/unwrapped-ltr.nix and qgis/unwrapped.nix
- comment in postFixup of telegram-desktop
- comment in postFixup of fwupd
- buildCommand of mongodb-compass
- postFixup of xflux-gui
- comment in a patch in kdePackages.kde-gtk-config and plasma5Packages.kde-gtk-config
- description of programs.sway.wrapperFeatures.gtk NixOS option (manual rebuild)
Makes sure that the qemu-utils build succeeds when qemu-utils is
about to be updated. It's a bit of an odd build perhaps, so it's
good to check that it still builds.
Benefits
- Reduce the derivation closure.
- This reduces rebuilds and makes derivations that use
qemu-utils less susceptible to build errors.
- Includes extra qemu tools that weren't included before.
- Removes fragile binary copying (old qemu-utils impl).
- Can't forget to copy somethat that a binary needs.
- Less custom packaging is better.
Cost
- Adds an 80 second build, but the time is offset by rebuilding
its dependents less.
- The output of qemu-utils goes from ~7 MB to ~40 MB, but it
provides more functionality.
qemu_kvm is a much smaller build, so it's nicer if you're building
qemu-utils specifically. None of the tools depend on the emulation
targets disabled in qemu_kvm.
The tools are copied, not linked, so we don't have to worry about
potentially depending on both qemu_kvm and qemu in a bigger
derivation, and qemu_kvm is already built by Hydra, so there's no
increase in Hydra workload by using the variant.
This makes qemu_kvm.tests do the right thing — building qemu_kvm with
tests enabled. Previously, it would always build qemu, so all targets
would be enabled, even if accessed through qemu_kvm.tests.
I've been having trouble with some qemu builds since the v8.0.0 bump
failing with:
```
kernel-doc 'perl /build/qemu/docs/../scripts/kernel-doc -rst -enable-lineno -sphinx-version 5.3.0 -Werror /build/qemu/docs/../include/qemu/bitops.h' processing failed with: [Errno 2] No such file or directory: 'perl'
```
... this happens despite `perl` being part of `stdenv`. Adding
`perl` to `nativeBuildInputs` doesn't seem to fix it. It is handy
to be able to simply skip the docs in situations like this in order
to maintain forward progress, so this commit adds `enableDocs?true`
to allow that.
Now that shaderinclude is Python, I don't think we need Perl any more.
virtiofsd has been removed in favor of the standalone virtiofsd package.
Co-authored-by: Will Cohen <willcohen@users.noreply.github.com>
'./configure --cpu=$(uname -m)' (essentially) breaks the case of riscv,
where the configure script expects '--cpu=riscv', but 'uname -m' gives
'riscv{32,64}'. This eventually leads to user-mode emulation being
disabled.
Since the configure script can auto-detect the parameter based on
compilers, remove this flag.
Originally added in #147692, but apparently it's not needed and @NickCao
couldn't remember why it was added. See also mailing list discussion at
https://lore.kernel.org/qemu-devel/20230204112502.2558739-1-mjt@msgid.tls.msk.ru/T/
The python dependencies were fixed for cross in #147692, but the changes
are reversed #190560 due to concerns of accidentally mixing python
versions. Compromise by using python3Packages.python.
checkInputs used to be added to nativeBuildInputs. Now we have
nativeCheckInputs to do that instead. Doing this treewide change allows
to keep hashes identical to before the introduction of
nativeCheckInputs.
