chore(3p/nix): Use packages from depot tree r/738

3 files changed, 28 insertions, 5 deletions

diff --git a/third_party/default.nix b/third_party/default.nix
index 8749335fa7..0731018d7c 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -117,6 +117,30 @@ let
       xz
       zlib
       zstd;
+
+    # Required by //third_party/nix
+    inherit (nixpkgs)
+      autoconf-archive
+      autoreconfHook
+      aws-sdk-cpp
+      bison
+      boehmgc
+      boost # urgh
+      brotli
+      busybox
+      curl
+      docbook5
+      docbook_xsl_ns
+      editline
+      flex
+      libseccomp
+      libsodium
+      libxml2
+      libxslt
+      mercurial
+      perl
+      perlPackages
+      utillinuxMinimal;
   };
 
 in exposed // {
diff --git a/third_party/nix/release.nix b/third_party/nix/release.nix
index 64aa1a9766..1d8ea4a4f6 100644
--- a/third_party/nix/release.nix
+++ b/third_party/nix/release.nix
@@ -1,5 +1,5 @@
 { nix ? builtins.fetchGit ./.
-, nixpkgs ? builtins.fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-19.03.tar.gz
+, nixpkgs ? (import <nixpkgs> {}).third_party
 , officialRelease ? false
 , systems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
 }:
diff --git a/third_party/nix/shell.nix b/third_party/nix/shell.nix
index e8026f8e40..e163fccf9c 100644
--- a/third_party/nix/shell.nix
+++ b/third_party/nix/shell.nix
@@ -1,10 +1,9 @@
-{ useClang ? false }:
-
-with import (builtins.fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-19.03.tar.gz) {};
+let pkgs = (import <nixpkgs> {}).third_party;
+in with pkgs;
 
 with import ./release-common.nix { inherit pkgs; };
 
-(if useClang then clangStdenv else stdenv).mkDerivation {
+clangStdenv.mkDerivation {
   name = "nix";
 
   buildInputs = buildDeps ++ propagatedDeps ++ tarballDeps ++ perlDeps;