chore(3p/nix): Use packages from depot tree
This commit is contained in:
parent
939cec746e
commit
c94ef8d00b
3 changed files with 28 additions and 5 deletions
24
third_party/default.nix
vendored
24
third_party/default.nix
vendored
|
@ -117,6 +117,30 @@ let
|
||||||
xz
|
xz
|
||||||
zlib
|
zlib
|
||||||
zstd;
|
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 // {
|
in exposed // {
|
||||||
|
|
2
third_party/nix/release.nix
vendored
2
third_party/nix/release.nix
vendored
|
@ -1,5 +1,5 @@
|
||||||
{ nix ? builtins.fetchGit ./.
|
{ 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
|
, officialRelease ? false
|
||||||
, systems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
|
, systems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
|
||||||
}:
|
}:
|
||||||
|
|
7
third_party/nix/shell.nix
vendored
7
third_party/nix/shell.nix
vendored
|
@ -1,10 +1,9 @@
|
||||||
{ useClang ? false }:
|
let pkgs = (import <nixpkgs> {}).third_party;
|
||||||
|
in with pkgs;
|
||||||
with import (builtins.fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-19.03.tar.gz) {};
|
|
||||||
|
|
||||||
with import ./release-common.nix { inherit pkgs; };
|
with import ./release-common.nix { inherit pkgs; };
|
||||||
|
|
||||||
(if useClang then clangStdenv else stdenv).mkDerivation {
|
clangStdenv.mkDerivation {
|
||||||
name = "nix";
|
name = "nix";
|
||||||
|
|
||||||
buildInputs = buildDeps ++ propagatedDeps ++ tarballDeps ++ perlDeps;
|
buildInputs = buildDeps ++ propagatedDeps ++ tarballDeps ++ perlDeps;
|
||||||
|
|
Loading…
Add table
Reference in a new issue