From 368e8d1eddb8cd95ded7b2f78e4805c67d28ff91 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Mon, 22 Jun 2020 20:11:43 -0400 Subject: feat(3p/nix): Add installCheckPhase Add an installCheckPhase that runs the appropriate substituteAll on common.sh and runs the lang.sh tests with the build artifacts in the PATH. Change-Id: I2df5a93b8f3ffdfdc194a0e7d6b6669ef520c345 Reviewed-on: https://cl.tvl.fyi/c/depot/+/561 Reviewed-by: glittershark --- third_party/default.nix | 1 + third_party/nix/default.nix | 13 +++++++++++++ 2 files changed, 14 insertions(+) (limited to 'third_party') diff --git a/third_party/default.nix b/third_party/default.nix index b4b799e8ee..993d7db352 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -126,6 +126,7 @@ let texlive thttpd tree + utillinux which writeShellScript writeShellScriptBin diff --git a/third_party/nix/default.nix b/third_party/nix/default.nix index e6fa3f1f7d..1a4e4bae08 100644 --- a/third_party/nix/default.nix +++ b/third_party/nix/default.nix @@ -48,11 +48,24 @@ in pkgs.llvmPackages.libcxxStdenv.mkDerivation { xz ]; + installCheckInputs = with pkgs; [ + utillinux + ]; + propagatedBuildInputs = with pkgs; [ boost largeBoehm ]; + doInstallCheck = true; + + installCheckPhase = '' + export PATH=$out/bin:$PATH + cd ../tests/ + substituteAll common.sh.in common.sh + bash lang.sh + ''; + # Install the various symlinks to the Nix binary which users expect # to exist. postInstall = '' -- cgit 1.4.1