diff --git a/fun/gemma/default.nix b/fun/gemma/default.nix index dbfaf5eff..902f5857d 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 dafd3cbb6..e4ce4df1a 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 824259804..cb5b2758e 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 da7c00ce4..8d8263c9d 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 49160071f..ca622666d 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 = [ diff --git a/third_party/nixpkgs-exposed/exposed/default.nix b/third_party/nixpkgs-exposed/exposed/default.nix index bac6dfe2f..3aa97e4bd 100644 --- a/third_party/nixpkgs-exposed/exposed/default.nix +++ b/third_party/nixpkgs-exposed/exposed/default.nix @@ -55,6 +55,7 @@ fetchgit fetchurl fetchzip + ffmpeg-full findutils fira fira-code