From 9bfd74deff5eea15a19bb79e4be82fdeb24ecf12 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 24 Mar 2018 07:33:04 -0400 Subject: [PATCH] qemu-riscv: Don't apply already-applied glibc-2.27 patch --- pkgs/applications/virtualization/qemu/riscv.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/riscv.nix b/pkgs/applications/virtualization/qemu/riscv.nix index 5e234dcb893..936aadcf991 100644 --- a/pkgs/applications/virtualization/qemu/riscv.nix +++ b/pkgs/applications/virtualization/qemu/riscv.nix @@ -16,7 +16,7 @@ in lib.overrideDerivation qemu (orig: { name = "${(builtins.parseDrvName qemu.name).name}-${version}pre${revCount}_${shortRev}"; inherit src; # https://github.com/riscv/riscv-qemu/pull/109 - patches = orig.patches ++ [ ./riscv-initrd.patch ]; + patches = [ ./no-etc-install.patch ./statfs-flags.patch ./riscv-initrd.patch ]; configureFlags = orig.configureFlags ++ [ "--target-list=${lib.concatStringsSep "," targets}" ]; postInstall = null; })