summary refs log tree commit diff
path: root/pkgs/tools/system
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-08-17 23:56:05 +0200
committerGitHub <noreply@github.com>2021-08-17 23:56:05 +0200
commit925953db858fa23317efd7397adf8a616599efaf (patch)
treed357392bef317a218376c681981b56f670a8ea0a /pkgs/tools/system
parent040a90e19bd27d5817a3bb4aeb31b9ad7ce40b0b (diff)
parentd327f21b1e77cf6c4111f6c14ecd7620a896cfc5 (diff)
downloadnixpkgs-925953db858fa23317efd7397adf8a616599efaf.tar
nixpkgs-925953db858fa23317efd7397adf8a616599efaf.tar.gz
nixpkgs-925953db858fa23317efd7397adf8a616599efaf.tar.bz2
nixpkgs-925953db858fa23317efd7397adf8a616599efaf.tar.lz
nixpkgs-925953db858fa23317efd7397adf8a616599efaf.tar.xz
nixpkgs-925953db858fa23317efd7397adf8a616599efaf.tar.zst
nixpkgs-925953db858fa23317efd7397adf8a616599efaf.zip
Merge pull request #134498 from alyssais/minijail
minijail: 16 -> 17
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r--pkgs/tools/system/minijail/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/system/minijail/default.nix b/pkgs/tools/system/minijail/default.nix
index fac934f7bb2..01873cb86aa 100644
--- a/pkgs/tools/system/minijail/default.nix
+++ b/pkgs/tools/system/minijail/default.nix
@@ -11,12 +11,12 @@ in
 
 stdenv.mkDerivation rec {
   pname = "minijail";
-  version = "16";
+  version = "17";
 
   src = fetchFromGitiles {
     url = "https://android.googlesource.com/platform/external/minijail";
     rev = "linux-v${version}";
-    sha256 = "0pxazds3w12c30msq6bxs4a9cbds0dkj6n3ca0i1wqvgz864yrgs";
+    sha256 = "1j65h50wa39m6qvgnh1pf59fv9jdsdbc6a6c1na7y0rgljxhmdzv";
   };
 
   nativeBuildInputs =
@@ -50,6 +50,8 @@ stdenv.mkDerivation rec {
     cp -v constants.json $out/share/minijail
   '';
 
+  enableParallelBuilding = true;
+
   meta = with lib; {
     homepage = "https://android.googlesource.com/platform/external/minijail/";
     description = "Sandboxing library and application using Linux namespaces and capabilities";