JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

invidious: fix build

Browse Source 
The build was broken since 52f8cf58a4 when
gcc was updated from 10 to 11. This forces lsquic's version of boringssl
to build with gcc 10.
This commit is contained in:
squalus 2022-05-12 17:08:35 -07:00
parent 766cf76b4f
commit 728b0c81fe
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
versions = builtins.fromJSON (builtins.readFile ./versions.json);
buildGoModuleGcc10 = buildGoModule.override { stdenv = gcc10Stdenv; };
# lsquic requires a specific boringssl version (noted in its README)
boringssl' = boringssl.overrideAttrs (old: {
boringssl' = (boringssl.overrideAttrs (old: {
version = versions.boringssl.rev;
src = fetchgit {
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.patch
];
});
})).override {
buildGoModule = buildGoModuleGcc10;
};
in
stdenv.mkDerivation rec {
pname = "lsquic";