summary refs log tree commit diff
path: root/pkgs/tools/system/minijail/default.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-12-19 09:19:50 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2019-12-19 09:19:50 +0100
commitf79e10061f4e7a8988831e9734e131492e5b311f (patch)
tree8ae45d9a41e802f5339f46cd0d05b5f7cb31ffad /pkgs/tools/system/minijail/default.nix
parentbf2877b9ab69caa83daf4191b13d903bc82ab337 (diff)
parent7315dc071c901b83dfcacb5536f32699b2cb610a (diff)
downloadnixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar
nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.gz
nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.bz2
nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.lz
nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.xz
nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.zst
nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/system/minijail/default.nix')
-rw-r--r--pkgs/tools/system/minijail/default.nix17
1 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/tools/system/minijail/default.nix b/pkgs/tools/system/minijail/default.nix
index 9debd9a33d8..2b4d1deb9f9 100644
--- a/pkgs/tools/system/minijail/default.nix
+++ b/pkgs/tools/system/minijail/default.nix
@@ -19,13 +19,20 @@ stdenv.mkDerivation rec {
     sed -i '/#include <asm\/siginfo.h>/ d' signal_handler.c
   '';
 
+  postPatch = ''
+    patchShebangs platform2_preinstall.sh
+  '';
+
+  postBuild = ''
+    ./platform2_preinstall.sh ${version} $out/include/chromeos
+  '';
+
   installPhase = ''
-    mkdir -p $out/lib
+    mkdir -p $out/lib/pkgconfig $out/include/chromeos $out/bin
     cp -v *.so $out/lib
-    mkdir -p $out/include
-    cp -v libminijail.h $out/include
-    mkdir -p $out/bin
-    cp minijail0 $out/bin
+    cp -v *.pc $out/lib/pkgconfig
+    cp -v libminijail.h scoped_minijail.h $out/include/chromeos
+    cp -v minijail0 $out/bin
   '';
 
   meta = {