Dandellion
/
NUR
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ree

This commit is contained in:
Daniel Olsen 2020-07-10 14:32:26 +02:00
parent 9ab5c17b9e
commit e1f29188d3
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
default.nix
View File

@ -8,7 +8,7 @@
{ pkgs ? import <nixos-unstable> {} }: { pkgs ? import <nixos-unstable> {} }:
{ rec {
# The `lib`, `modules`, and `overlay` names are special # The `lib`, `modules`, and `overlay` names are special
lib = import ./lib { inherit pkgs; }; # functions lib = import ./lib { inherit pkgs; }; # functions
modules = import ./modules; # NixOS modules modules = import ./modules; # NixOS modules

22
pkgs/grav1/default.nix
View File

@ -14,12 +14,14 @@ stdenv.mkDerivation {
pname = "grav1"; pname = "grav1";
version = "0.0.0-20200708"; version = "0.0.0-20200708";
src = fetchFromGitHub { # src = fetchFromGitHub {
owner = "wwww-wwww"; # owner = "wwww-wwww";
repo = "grav1"; # repo = "grav1";
rev = "975e16d7fedc2d4f012c694cb5b1b0876c3cac01"; # rev = "975e16d7fedc2d4f012c694cb5b1b0876c3cac01";
sha256 = "11vingnczwy7wxrzp0hqij0jwwzbwjjd8l35wk2zps28npazaly3"; # sha256 = "11vingnczwy7wxrzp0hqij0jwwzbwjjd8l35wk2zps28npazaly3";
}; # };
src = ./grav1;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ pythonEnv ]; buildInputs = [ pythonEnv ];
@ -36,8 +38,14 @@ stdenv.mkDerivation {
cp actions.py $out/bin/actions.py cp actions.py $out/bin/actions.py
chmod +x $out/bin/server chmod +x $out/bin/server
cp grav1c.py $out/bin/client
chmod +x $out/bin/client
wrapProgram $out/bin/server \ 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;}) ]}
''; '';
} }