about summary refs log tree commit diff
path: root/pkgs/tools/system
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-03-27 08:43:04 +0000
committerAlyssa Ross <hi@alyssa.is>2020-04-01 13:44:28 +0000
commit9225d95bdd9b8100d6c9cc738f0305933e1d1ccc (patch)
treef3c6adebff663d11fb9c3da073389b1dd462a792 /pkgs/tools/system
parent75922aa1e177d398782ba5c75fdd028f69c24795 (diff)
downloadnixlib-9225d95bdd9b8100d6c9cc738f0305933e1d1ccc.tar
nixlib-9225d95bdd9b8100d6c9cc738f0305933e1d1ccc.tar.gz
nixlib-9225d95bdd9b8100d6c9cc738f0305933e1d1ccc.tar.bz2
nixlib-9225d95bdd9b8100d6c9cc738f0305933e1d1ccc.tar.lz
nixlib-9225d95bdd9b8100d6c9cc738f0305933e1d1ccc.tar.xz
nixlib-9225d95bdd9b8100d6c9cc738f0305933e1d1ccc.tar.zst
nixlib-9225d95bdd9b8100d6c9cc738f0305933e1d1ccc.zip
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`".
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r--pkgs/tools/system/minijail/default.nix7
1 files changed, 3 insertions, 4 deletions
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 = ''