diff --git a/default.nix b/default.nix
index db2b4a0..9b06e50 100644
--- a/default.nix
+++ b/default.nix
@@ -8,7 +8,7 @@
 
 { pkgs ? import <nixos-unstable> {} }:
 
-{
+rec {
   # The `lib`, `modules`, and `overlay` names are special
   lib = import ./lib { inherit pkgs; }; # functions
   modules = import ./modules; # NixOS modules
diff --git a/pkgs/grav1/default.nix b/pkgs/grav1/default.nix
index 5749cf4..44c18a6 100644
--- a/pkgs/grav1/default.nix
+++ b/pkgs/grav1/default.nix
@@ -14,12 +14,14 @@ stdenv.mkDerivation {
   pname = "grav1";
   version = "0.0.0-20200708";
 
-  src = fetchFromGitHub {
-    owner = "wwww-wwww";
-    repo = "grav1";
-    rev = "975e16d7fedc2d4f012c694cb5b1b0876c3cac01";
-    sha256 = "11vingnczwy7wxrzp0hqij0jwwzbwjjd8l35wk2zps28npazaly3";
-  };
+#  src = fetchFromGitHub {
+#    owner = "wwww-wwww";
+#    repo = "grav1";
+#    rev = "975e16d7fedc2d4f012c694cb5b1b0876c3cac01";
+#    sha256 = "11vingnczwy7wxrzp0hqij0jwwzbwjjd8l35wk2zps28npazaly3";
+#  };
+
+  src = ./grav1;
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ pythonEnv ];
@@ -36,8 +38,14 @@ stdenv.mkDerivation {
     cp actions.py $out/bin/actions.py
     chmod +x $out/bin/server
 
+    cp grav1c.py $out/bin/client
+    chmod +x $out/bin/client
+
     wrapProgram $out/bin/server \
-      --prefix PATH : ${lib.makeBinPath [ ffmpeg libaom libvpx dav1d ]}
+      --prefix PATH : ${lib.makeBinPath [ ffmpeg libaom libvpx (dav1d.override { withTools = true;}) ]}
+
+    wrapProgram $out/bin/client \
+      --prefix PATH : ${lib.makeBinPath [ ffmpeg libaom libvpx (dav1d.override { withTools = true;}) ]}
   '';
 
 }