summary refs log tree commit diff
path: root/pkgs/applications/virtualization
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-11-11 18:13:59 +0100
committerGitHub <noreply@github.com>2021-11-11 18:13:59 +0100
commit95cce00929e063707be6400aa2fb811e7160d91c (patch)
tree8ba153e1230d0e5167034eee47ac4359bc6f8a46 /pkgs/applications/virtualization
parent68a6a4e276e26019b090bb587a8d7b26c4f92532 (diff)
parent92ed47487f148061fab7396eb39b80df6eee5400 (diff)
downloadnixpkgs-95cce00929e063707be6400aa2fb811e7160d91c.tar
nixpkgs-95cce00929e063707be6400aa2fb811e7160d91c.tar.gz
nixpkgs-95cce00929e063707be6400aa2fb811e7160d91c.tar.bz2
nixpkgs-95cce00929e063707be6400aa2fb811e7160d91c.tar.lz
nixpkgs-95cce00929e063707be6400aa2fb811e7160d91c.tar.xz
nixpkgs-95cce00929e063707be6400aa2fb811e7160d91c.tar.zst
nixpkgs-95cce00929e063707be6400aa2fb811e7160d91c.zip
Merge pull request #141717 from r-burns/qemu
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r--pkgs/applications/virtualization/qemu/default.nix4
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";