From 9225d95bdd9b8100d6c9cc738f0305933e1d1ccc Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 27 Mar 2020 08:43:04 +0000
Subject: minijail: android-10.0.0_r9 -> 14

Switched from the android-* tags to the linux-* ones, because Upstream
says "Releases are tagged as `linux-vXX`".
---
 pkgs/tools/system/minijail/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'pkgs/tools/system')

diff --git a/pkgs/tools/system/minijail/default.nix b/pkgs/tools/system/minijail/default.nix
index 32858051caba..5c4c45fbca2c 100644
--- a/pkgs/tools/system/minijail/default.nix
+++ b/pkgs/tools/system/minijail/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "minijail";
-  version = "android-10.0.0_r9";
+  version = "14";
 
   src = fetchFromGitiles {
     url = "https://android.googlesource.com/platform/external/minijail";
-    rev = version;
-    sha256 = "0gcfsyim1krrddcklydqfxl8mamaxgail2xl5qp9yclq60km8f22";
+    rev = "linux-v${version}";
+    sha256 = "00dq854n4zg3ca2b46f90k15n32zn2sgabi76mnq2w985k9v977n";
   };
 
   buildInputs = [ libcap ];
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     substituteInPlace common.mk --replace /bin/echo echo
-    sed -i '/#include <asm\/siginfo.h>/ d' signal_handler.c
   '';
 
   postPatch = ''
-- 
cgit 1.4.1