diff --git a/third_party/default.nix b/third_party/default.nix index b4b799e8e..993d7db35 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 e6fa3f1f7..1a4e4bae0 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 = ''