diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-11 18:01:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-11 18:01:50 +0000 |
| commit | a4e03b897765f3b4e0c2182d323a2690ce8b28a0 (patch) | |
| tree | 27f3acedbffe1140a75901e64ea4b4eb23083620 /pkgs/applications/virtualization | |
| parent | bb4cba1777733b5bdae896330bccf1ff0886bfc3 (diff) | |
| parent | f2d72714321af3de5bf635e76fef21ab87a25f96 (diff) | |
| download | nixpkgs-a4e03b897765f3b4e0c2182d323a2690ce8b28a0.tar nixpkgs-a4e03b897765f3b4e0c2182d323a2690ce8b28a0.tar.gz nixpkgs-a4e03b897765f3b4e0c2182d323a2690ce8b28a0.tar.bz2 nixpkgs-a4e03b897765f3b4e0c2182d323a2690ce8b28a0.tar.lz nixpkgs-a4e03b897765f3b4e0c2182d323a2690ce8b28a0.tar.xz nixpkgs-a4e03b897765f3b4e0c2182d323a2690ce8b28a0.tar.zst nixpkgs-a4e03b897765f3b4e0c2182d323a2690ce8b28a0.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index fba8ecf9d9a..b95979fe88c 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -112,10 +112,6 @@ stdenv.mkDerivation rec { }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch ++ lib.optionals stdenv.hostPlatform.isMusl [ - (fetchpatch { - url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch"; - sha256 = "1gm67v41gw6apzgz7jr3zv9z80wvkv0jaxd2w4d16hmipa8bhs0k"; - }) ./sigrtminmax.patch (fetchpatch { url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch"; |