about summary refs log tree commit diff
diff options
context:
space:
mode:
authorglittershark <grfn@gws.fyi>2020-06-23T15·10+0000
committerglittershark <grfn@gws.fyi>2020-06-23T15·23+0000
commitec84fde6b11c4e138a2a50dda89d1bf48b6aa5c1 (patch)
tree587ee55eab296470606b9c91bf153e03276db3e2
parent9ead20ef9f860cd0eb3acc4397499109db99fb95 (diff)
fix(3p/nix): Revert "feat(3p/nix): Add installCheckPhase" r/1069
This reverts commit 368e8d1eddb8cd95ded7b2f78e4805c67d28ff91.

Reason for revert: Didn't mean to submit, and the phase is currently failing (which breaks the otherwise-functional derivation)

Change-Id: I515b2fb45188dc90f09ae2458453192487c74d71
Reviewed-on: https://cl.tvl.fyi/c/depot/+/581
Reviewed-by: tazjin <mail@tazj.in>
-rw-r--r--third_party/default.nix1
-rw-r--r--third_party/nix/default.nix13
2 files changed, 0 insertions, 14 deletions
diff --git a/third_party/default.nix b/third_party/default.nix
index 993d7db352d7..b4b799e8ee59 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -126,7 +126,6 @@ let
       texlive
       thttpd
       tree
-      utillinux
       which
       writeShellScript
       writeShellScriptBin
diff --git a/third_party/nix/default.nix b/third_party/nix/default.nix
index 1a4e4bae089f..e6fa3f1f7d62 100644
--- a/third_party/nix/default.nix
+++ b/third_party/nix/default.nix
@@ -48,24 +48,11 @@ 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 = ''