From f2443911cc730cbdd927a8c8b8e0012659a464ff Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sat, 10 Apr 2021 13:38:50 +0200
Subject: 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>
---
 fun/gemma/default.nix           | 4 ++--
 fun/paroxysm/default.nix        | 7 ++-----
 fun/paroxysm/docker/default.nix | 4 ++--
 fun/streamTVL/default.nix       | 6 +++---
 fun/uggc/default.nix            | 5 +++--
 5 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'fun')

diff --git a/fun/gemma/default.nix b/fun/gemma/default.nix
index dbfaf5effc31..902f5857db42 100644
--- a/fun/gemma/default.nix
+++ b/fun/gemma/default.nix
@@ -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
diff --git a/fun/paroxysm/default.nix b/fun/paroxysm/default.nix
index dafd3cbb616b..e4ce4df1ae38 100644
--- a/fun/paroxysm/default.nix
+++ b/fun/paroxysm/default.nix
@@ -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 = ./.;
diff --git a/fun/paroxysm/docker/default.nix b/fun/paroxysm/docker/default.nix
index 824259804a1c..cb5b2758ec63 100644
--- a/fun/paroxysm/docker/default.nix
+++ b/fun/paroxysm/docker/default.nix
@@ -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" ];
diff --git a/fun/streamTVL/default.nix b/fun/streamTVL/default.nix
index da7c00ce4be5..8d8263c9dd3f 100644
--- a/fun/streamTVL/default.nix
+++ b/fun/streamTVL/default.nix
@@ -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 \
diff --git a/fun/uggc/default.nix b/fun/uggc/default.nix
index 49160071f586..ca622666dcd5 100644
--- a/fun/uggc/default.nix
+++ b/fun/uggc/default.nix
@@ -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 = [
-- 
cgit 1.4.1