diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-12 00:07:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-12 00:07:24 +0000 |
| commit | 8addf990da84a2091616d06657b4374e28eaee01 (patch) | |
| tree | a1ed1d781c79afe8e2a0d3108cebec4242a3f4c2 /pkgs/applications/virtualization | |
| parent | d602c931e29416a813111e8815e83fe39d41a7d6 (diff) | |
| parent | e7f0ed16c47e93456bf3f15985232b552b3dd2fa (diff) | |
| download | nixpkgs-8addf990da84a2091616d06657b4374e28eaee01.tar nixpkgs-8addf990da84a2091616d06657b4374e28eaee01.tar.gz nixpkgs-8addf990da84a2091616d06657b4374e28eaee01.tar.bz2 nixpkgs-8addf990da84a2091616d06657b4374e28eaee01.tar.lz nixpkgs-8addf990da84a2091616d06657b4374e28eaee01.tar.xz nixpkgs-8addf990da84a2091616d06657b4374e28eaee01.tar.zst nixpkgs-8addf990da84a2091616d06657b4374e28eaee01.zip | |
Merge master into haskell-updates
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 48b83140e42..477b1603d27 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"; |