refactor(fun): Consistent use of depot.third_party vs. pkgs

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 //fun

Change-Id: I45a7b392a9749fa7859ff5100dcea415bda807c3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2914
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2021-04-10 13:38:50 +02:00 committed by tazjin
parent 8361b82d0a
commit f2443911cc
6 changed files with 13 additions and 14 deletions

View file

@ -2,7 +2,7 @@
let
inherit (pkgs) cacert iana-etc libredirect stdenv runCommandNoCC writeText;
elmPackages = pkgs.elmPackages_0_18;
elmPackages = depot.third_party.elmPackages_0_18;
frontend = stdenv.mkDerivation {
name = "gemma-frontend.html";
@ -36,7 +36,7 @@ let
in depot.nix.buildLisp.program {
name = "gemma";
deps = with pkgs.lisp; [
deps = with depot.third_party.lisp; [
cl-json
cl-prevalence
hunchentoot

View file

@ -1,9 +1,6 @@
{ depot, ... }:
{ depot, pkgs, ... }:
let
pkgs = depot.third_party;
in
pkgs.naersk.buildPackage {
depot.third_party.naersk.buildPackage {
name = "paroxysm";
version = "0.0.2";
src = ./.;

View file

@ -1,6 +1,6 @@
{ depot, ... }:
{ depot, pkgs, ... }:
depot.third_party.dockerTools.buildLayeredImage {
pkgs.dockerTools.buildLayeredImage {
name = "paroxysm";
contents = [ depot.fun.paroxysm ];
config.Entrypoint = [ "${depot.fun.paroxysm}/bin/paroxysm" ];

View file

@ -1,7 +1,7 @@
{ depot, ... }:
{ pkgs, ... }:
depot.third_party.writeShellScriptBin "start-tvl-stream" ''
env LD_LIBRARY_PATH=/run/opengl-driver/lib/ ${depot.third_party.ffmpeg}/bin/ffmpeg \
pkgs.writeShellScriptBin "start-tvl-stream" ''
env LD_LIBRARY_PATH=/run/opengl-driver/lib/ ${pkgs.ffmpeg-full}/bin/ffmpeg \
-vsync 0 \
-hwaccel cuvid \
-init_hw_device cuda=0 -filter_hw_device 0 \

View file

@ -1,7 +1,8 @@
{ depot, pkgs, ... }@args:
{ depot, pkgs, ... }:
let
inherit (pkgs) gopkgs;
inherit (depot.third_party) gopkgs;
uggc = depot.nix.buildGo.program {
name = "uggc";
srcs = [

View file

@ -55,6 +55,7 @@
fetchgit
fetchurl
fetchzip
ffmpeg-full
findutils
fira
fira-code