diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-04-10T00·13+0200 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2021-04-10T11·48+0000 |
| commit | 8361b82d0ac59f436f7ecef283077b0f7d689ca1 (patch) | |
| tree | 15f9649ae9f3381c7218ea4f46fc9979a12f11bd /third_party/cgit | |
| parent | 8d4b2f3d54e760ab9f7f8242370a54ff20796553 (diff) | |
refactor(third_party): Consistent use of depot.third_party vs. pkgs r/2461
In preparation for the solution of b/108, we need to consistently use `depot.third_party` for packages that are only packed in the TVL depot and `pkgs` for things that come from nixpkgs. This commit cleans up a huge chunk of these uses in //third_party Change-Id: Ic382c0cdea7330a84d5f0b7d109c824ddceb94e7 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2912 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'third_party/cgit')
| -rw-r--r-- | third_party/cgit/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/third_party/cgit/default.nix b/third_party/cgit/default.nix index e108bb1d7d80..3c7a904b0bd2 100644 --- a/third_party/cgit/default.nix +++ b/third_party/cgit/default.nix @@ -1,9 +1,8 @@ -{ depot, ... }: +{ depot, lib, pkgs, ... }: let - inherit (depot.third_party) lib stdenv gzip bzip2 xz luajit zlib autoconf openssl pkgconfig; -in -stdenv.mkDerivation rec { + inherit (pkgs) stdenv gzip bzip2 xz luajit zlib autoconf openssl pkgconfig; +in stdenv.mkDerivation rec { pname = "cgit"; version = "master"; src = ./.; |