summary refs log tree commit diff
path: root/pkgs/tools/system
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-12-02 16:43:40 +0000
committerAlyssa Ross <hi@alyssa.is>2019-12-02 22:46:17 +0000
commitfa0fe1d8c93463b29649eed0957994e01c33d502 (patch)
tree1587d4907e83a4eb45c8cc64e6b2d008e2a69b89 /pkgs/tools/system
parenta8508f7266f245756b78557861d315e05625c6b2 (diff)
downloadnixpkgs-fa0fe1d8c93463b29649eed0957994e01c33d502.tar
nixpkgs-fa0fe1d8c93463b29649eed0957994e01c33d502.tar.gz
nixpkgs-fa0fe1d8c93463b29649eed0957994e01c33d502.tar.bz2
nixpkgs-fa0fe1d8c93463b29649eed0957994e01c33d502.tar.lz
nixpkgs-fa0fe1d8c93463b29649eed0957994e01c33d502.tar.xz
nixpkgs-fa0fe1d8c93463b29649eed0957994e01c33d502.tar.zst
nixpkgs-fa0fe1d8c93463b29649eed0957994e01c33d502.zip
minijail: install .pc files and scoped_minijail.h
This matches the behaviour of the Chromium OS ebuild for this package:
https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/cd6d6815b1604105cb6b8c40b2e0c3f15f401e3b/chromeos-base/minijail/minijail-10-r38.ebuild#47
Diffstat (limited to 'pkgs/tools/system')
-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 74f0a84716a..abf065eb531 100644
--- a/pkgs/tools/system/minijail/default.nix
+++ b/pkgs/tools/system/minijail/default.nix
@@ -20,13 +20,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 = {