lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

Project import generated by Copybara.

Browse source 
GitOrigin-RevId: d9dba88d08a9cdf483c3d45f0d7220cf97a4ce64
This commit is contained in:
Default email 2021-01-05 19:05:55 +02:00
parent 74a05b062a
commit db5e1646d7
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
third_party/nixpkgs/pkgs/games/factorio/versions.json vendored
View file

@ -2,12 +2,12 @@
"x86_64-linux": { "x86_64-linux": {
"alpha": { "alpha": {
"experimental": { "experimental": {
"name": "factorio_alpha_x64-1.1.6.tar.xz", "name": "factorio_alpha_x64-1.1.7.tar.xz",
"needsAuth": true, "needsAuth": true,
"sha256": "1dg8dh5pivqyjfnhbn01pwwph3xsj1xzvzbv3kzxg5pvjcfx0k6z", "sha256": "0wqrs5w5giybq47hfv5wwg7c36351kfsa5x06nvxls2znyl43qv8",
"tarDirectory": "x64", "tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.6/alpha/linux64", "url": "https://factorio.com/get-download/1.1.7/alpha/linux64",
"version": "1.1.6" "version": "1.1.7"
}, },
"stable": { "stable": {
"name": "factorio_alpha_x64-1.0.0.tar.xz", "name": "factorio_alpha_x64-1.0.0.tar.xz",
@ -38,12 +38,12 @@
}, },
"headless": { "headless": {
"experimental": { "experimental": {
"name": "factorio_headless_x64-1.1.6.tar.xz", "name": "factorio_headless_x64-1.1.7.tar.xz",
"needsAuth": false, "needsAuth": false,
"sha256": "0bgjq2i2jn07k4awiqxsbf15p2xwn0k0aj11xpdyxvjjky8npwaa", "sha256": "1s52p6cvd2v0pmj4gppc2pf8r6bpbzkmwpw8451j3ic58fhjvypr",
"tarDirectory": "x64", "tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.6/headless/linux64", "url": "https://factorio.com/get-download/1.1.7/headless/linux64",
"version": "1.1.6" "version": "1.1.7"
}, },
"stable": { "stable": {
"name": "factorio_headless_x64-1.0.0.tar.xz", "name": "factorio_headless_x64-1.0.0.tar.xz",

18
third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix vendored
View file

@ -1,5 +1,6 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, srt , srt
, ffmpeg_3_4 , ffmpeg_3_4
, bc , bc
@ -12,6 +13,7 @@
, libopus , libopus
, srtp , srtp
, jemalloc , jemalloc
, pcre2
}: }:
let let
@ -27,21 +29,29 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "oven-media-engine"; pname = "oven-media-engine";
version = "0.10.8"; version = "0.10.9-hotfix";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AirenSoft"; owner = "AirenSoft";
repo = "OvenMediaEngine"; repo = "OvenMediaEngine";
rev = "v${version}"; rev = "v${version}";
sha256 = "ec4yvS+4/rTBHGEx2OP0yoNGDtzPucFOcZJ0o0cCAHg="; sha256 = "1fhria0vwqsgmsglv5gn858li33vfy2dwy1f1qdd2jwikskb53am";
}; };
patches = [
(fetchpatch {
url = "https://github.com/AirenSoft/OvenMediaEngine/commit/ad83e1d2226445d649e4b7e0c75106e31af4940d.patch";
sha256 = "1zk1rgi1wsjl6gdx3hdmgxlgindv6a3lsnkwcgi87ga9abw4vafw";
stripLen = 1;
})
];
sourceRoot = "source/src"; sourceRoot = "source/src";
makeFlags = "release CONFIG_LIBRARY_PATHS= CONFIG_PKG_PATHS= GLOBAL_CC=$(CC) GLOBAL_CXX=$(CXX) GLOBAL_LD=$(CXX) SHELL=${stdenv.shell}"; makeFlags = "release CONFIG_LIBRARY_PATHS= CONFIG_PKG_PATHS= GLOBAL_CC=$(CC) GLOBAL_CXX=$(CXX) GLOBAL_LD=$(CXX) SHELL=${stdenv.shell}";
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ bc pkgconfig perl ]; nativeBuildInputs = [ bc pkgconfig perl ];
buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc ]; buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 ];
preBuild = '' preBuild = ''
patchShebangs core/colorg++ patchShebangs core/colorg++
@ -62,7 +72,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Open-source streaming video service with sub-second latency"; description = "Open-source streaming video service with sub-second latency";
homepage = "https://ovenmediaengine.com"; homepage = "https://ovenmediaengine.com";
license = licenses.gpl2; license = licenses.gpl2Only;
maintainers = with maintainers; [ lukegb ]; maintainers = with maintainers; [ lukegb ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };