From fa0fe1d8c93463b29649eed0957994e01c33d502 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 2 Dec 2019 16:43:40 +0000 Subject: [PATCH] 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 --- pkgs/tools/system/minijail/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/minijail/default.nix b/pkgs/tools/system/minijail/default.nix index 74f0a84716a1..abf065eb5319 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 / 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 = {