1 files changed, 21 insertions, 18 deletions

diff --git a/flake.nix b/flake.nix
index abac232..770105e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,9 +11,8 @@
   description = "yt";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
 
-    flake-utils.url = "github:numtide/flake-utils";
     treefmt-nix = {
       url = "github:numtide/treefmt-nix";
       inputs = {
@@ -25,52 +24,53 @@
   outputs = {
     self,
     nixpkgs,
-    flake-utils,
     treefmt-nix,
-  }: (flake-utils.lib.eachDefaultSystem (system: let
+  }: let
+    system = "x86_64-linux";
     pkgs = nixpkgs.legacyPackages."${system}";
 
-    python = pkgs.python3.withPackages (ps: [
-      ps.yt-dlp
-      blake3
-    ]);
-
     buildInputs = with pkgs; [
       mpv-unwrapped.dev
+      libffi
+      openssl
+      zlib
+      curl.dev
     ];
 
     nativeBuildInputs = with pkgs; [
       llvmPackages_latest.clang-unwrapped.lib
+      pkg-config
 
       # Needed for the tests in `libmpv2`
       SDL2
     ];
 
-    yt = pkgs.callPackage ./package/package.nix {inherit blake3 tree-sitter-yts;};
-    blake3 = pkgs.callPackage ./package/blake3/blake3.nix {};
+    yt = pkgs.callPackage ./nix/package.nix {inherit tree-sitter-yts;};
     tree-sitter-yts = pkgs.callPackage ./tree-sitter-yts/package.nix {};
 
     treefmtEval = import ./treefmt.nix {inherit treefmt-nix pkgs;};
   in {
-    packages = {
-      inherit yt blake3 tree-sitter-yts;
+    packages."${system}" = {
+      inherit yt tree-sitter-yts;
       default = self.packages.${system}.yt;
     };
 
-    checks = {
+    checks."${system}" = {
       inherit yt;
       formatting = treefmtEval.config.build.check self;
     };
 
-    formatter = treefmtEval.config.build.wrapper;
+    formatter."${system}" = treefmtEval.config.build.wrapper;
 
-    devShells.default = pkgs.mkShell {
+    devShells."${system}".default = pkgs.mkShell {
       env = let
         clang_version =
           pkgs.lib.versions.major
           pkgs.llvmPackages_latest.clang-unwrapped.version;
       in {
         FFMPEG_LOCATION = "${pkgs.lib.getExe pkgs.ffmpeg}";
+
+        # These are needed for `libmpv` to compile.
         LIBCLANG_PATH = "${pkgs.llvmPackages_latest.clang-unwrapped.lib}/lib/libclang.so";
         LIBCLANG_INCLUDE_PATH = "${pkgs.llvmPackages_latest.clang-unwrapped.lib}/lib/clang/${clang_version}/include";
         C_INCLUDE_PATH = "${pkgs.glibc.dev}/include";
@@ -91,6 +91,7 @@
         pkgs.cargo-flamegraph
 
         # Releng
+        pkgs.git-bug
         pkgs.reuse
         pkgs.cocogitto
 
@@ -102,13 +103,15 @@
         pkgs.sqlite-interactive
 
         # yt_dlp
-        python
+        pkgs.python3Packages.yt-dlp
+        pkgs.python3Packages.chardet
         pkgs.jq
+        pkgs.ffmpeg
 
         # Tree-sitter
         pkgs.nodejs
         pkgs.tree-sitter
       ];
     };
-  }));
+  };
 }