From 57fa425a00a577de9c10ad7ad5dd82afe0e28255 Mon Sep 17 00:00:00 2001
From: Daniel Olsen <daniel.olsen99@gmail.com>
Date: Fri, 14 Aug 2020 16:45:59 +0200
Subject: [PATCH] update grav1

---
 pkgs/grav1/client.nix |  8 ++++----
 pkgs/grav1/server.nix | 20 ++++++++------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/pkgs/grav1/client.nix b/pkgs/grav1/client.nix
index 7bc08eb..f63017c 100644
--- a/pkgs/grav1/client.nix
+++ b/pkgs/grav1/client.nix
@@ -7,13 +7,13 @@ let
 in
 stdenv.mkDerivation { 
   pname = "grav1c";
-  version = "0.0.0-20200708";
+  version = "0.0.0-20200811";
 
   src = fetchFromGitHub {
     owner = "wwww-wwww";
     repo = "grav1";
-    rev = "975e16d7fedc2d4f012c694cb5b1b0876c3cac01";
-    sha256 = "11vingnczwy7wxrzp0hqij0jwwzbwjjd8l35wk2zps28npazaly3";
+    rev = "f0e713a399ffb287835a0c5ea31e02cd9babbe34";
+    sha256 = "025jqhdh5ysgca9yj0q1ld0s1y30bzfbb57wgr78wja61ywnqmgy";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/bin
-    cp grav1c.py $out/bin/grav1c
+    cp client.py $out/bin/grav1c
     chmod +x $out/bin/grav1c
 
     wrapProgram $out/bin/grav1c \
diff --git a/pkgs/grav1/server.nix b/pkgs/grav1/server.nix
index 542b2eb..428267c 100644
--- a/pkgs/grav1/server.nix
+++ b/pkgs/grav1/server.nix
@@ -12,13 +12,14 @@ let
 in
 stdenv.mkDerivation { 
   pname = "grav1";
-  version = "0.0.0-20200708";
+  version = "0.0.0-20200811";
 
   src = fetchFromGitHub {
     owner = "wwww-wwww";
+    fetchSubmodules = true;
     repo = "grav1";
-    rev = "975e16d7fedc2d4f012c694cb5b1b0876c3cac01";
-    sha256 = "11vingnczwy7wxrzp0hqij0jwwzbwjjd8l35wk2zps28npazaly3";
+    rev = "f0e713a399ffb287835a0c5ea31e02cd9babbe34";
+    sha256 = "00s7w8gx5718zp8d7iqvya1sv9grcca73ciw4hbqkd1pfigg6x8y";
   };
 
 #  src = ./grav1;
@@ -27,15 +28,10 @@ stdenv.mkDerivation {
   buildInputs = [ pythonEnv ];
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp server.py $out/bin/server
-    cp logger.py $out/bin/logger.py
-    cp project.py $out/bin/project.py
-    cp split.py $out/bin/split.py
-    cp util.py $out/bin/util.py
-    cp mkv_keyframes.py $out/bin/mkv_keyframes.py
-    cp aom_keyframes.py $out/bin/aom_keyframes.py
-    cp actions.py $out/bin/actions.py
+    mkdir -p $out/grav1 $out/bin
+    cp -r * $out/grav1
+    rm $out/grav1/client.py
+    ln -s $out/grav1/server.py $out/bin/server
     chmod +x $out/bin/server
 
     wrapProgram $out/bin/server \