summary refs log tree commit diff
path: root/pkgs/applications/virtualization/qemu/default.nix
diff options
context:
space:
mode:
authorWill Dietz <github@wdtz.org>2018-09-10 01:14:37 -0500
committerxeji <36407913+xeji@users.noreply.github.com>2018-09-10 08:14:37 +0200
commit8fc2799e02975c7f44c761db6959af9804478649 (patch)
tree4d7e3dd9faf54a6b84061015bea59ad63c79915f /pkgs/applications/virtualization/qemu/default.nix
parentb7c0e4079646ad816366754283f06d872de2b219 (diff)
downloadnixlib-8fc2799e02975c7f44c761db6959af9804478649.tar
nixlib-8fc2799e02975c7f44c761db6959af9804478649.tar.gz
nixlib-8fc2799e02975c7f44c761db6959af9804478649.tar.bz2
nixlib-8fc2799e02975c7f44c761db6959af9804478649.tar.lz
nixlib-8fc2799e02975c7f44c761db6959af9804478649.tar.xz
nixlib-8fc2799e02975c7f44c761db6959af9804478649.tar.zst
nixlib-8fc2799e02975c7f44c761db6959af9804478649.zip
qemu: port musl patch to new version (#46449)
Diffstat (limited to 'pkgs/applications/virtualization/qemu/default.nix')
-rw-r--r--pkgs/applications/virtualization/qemu/default.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index bbb2a099666b..596bc9dd9e09 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -84,10 +84,7 @@ stdenv.mkDerivation rec {
       url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch;
       sha256 = "1gm67v41gw6apzgz7jr3zv9z80wvkv0jaxd2w4d16hmipa8bhs0k";
     })
-    (fetchpatch {
-      url = https://raw.githubusercontent.com/alpinelinux/aports/61a7a1b77a868e3b940c0b25e6c2b2a6c32caf20/main/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch;
-      sha256 = "1ar6r1vpmhnbs72v6mhgyahcjcf7b9b4xi7asx17sy68m171d2g6";
-    })
+    ./sigrtminmax.patch
     (fetchpatch {
       url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch;
       sha256 = "0wk0rrcqywhrw9hygy6ap0lfg314m9z1wr2hn8338r5gfcw75mav";