update grav1
This commit is contained in:
		
							parent
							
								
									2e99f366c0
								
							
						
					
					
						commit
						57fa425a00
					
				@ -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 \
 | 
			
		||||
 | 
			
		||||
@ -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 \
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user