cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #172782 from squalus/invidious

Browse source 
invidious: fix build
This commit is contained in:
Artturi 2022-05-13 04:02:53 +03:00 committed by GitHub
commit 682c8b1a70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/servers/invidious/lsquic.nix
View file

@ -1,9 +1,11 @@
{ lib, boringssl, stdenv, fetchgit, fetchFromGitHub, cmake, zlib, perl, libevent }: { lib, boringssl, stdenv, fetchgit, fetchFromGitHub, cmake, zlib, perl, libevent, gcc10Stdenv, buildGoModule }:
let let
versions = builtins.fromJSON (builtins.readFile ./versions.json); versions = builtins.fromJSON (builtins.readFile ./versions.json);
buildGoModuleGcc10 = buildGoModule.override { stdenv = gcc10Stdenv; };
# lsquic requires a specific boringssl version (noted in its README) # lsquic requires a specific boringssl version (noted in its README)
boringssl' = boringssl.overrideAttrs (old: { boringssl' = (boringssl.overrideAttrs (old: {
version = versions.boringssl.rev; version = versions.boringssl.rev;
src = fetchgit { src = fetchgit {
url = "https://boringssl.googlesource.com/boringssl"; url = "https://boringssl.googlesource.com/boringssl";
@ -14,7 +16,9 @@ let
# Use /etc/ssl/certs/ca-certificates.crt instead of /etc/ssl/cert.pem # Use /etc/ssl/certs/ca-certificates.crt instead of /etc/ssl/cert.pem
./use-etc-ssl-certs.patch ./use-etc-ssl-certs.patch
]; ];
}); })).override {
buildGoModule = buildGoModuleGcc10;
};
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lsquic"; pname = "lsquic";