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

Merge pull request #147569 from arkivm/fix-invidious

Browse Source 
invidious/lsquic: fix build
This commit is contained in:
Kira Bruneau 2021-11-27 09:52:06 -05:00 committed by GitHub
commit c4414bf740
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
buildInputs = [ boringssl' libevent zlib ];
cmakeFlags = [
"-DBORINGSSL_DIR=${boringssl'}"
"-DBORINGSSL_LIB_crypto=${boringssl'}/lib/libcrypto.a"
"-DBORINGSSL_LIB_ssl=${boringssl'}/lib/libssl.a"
"-DBORINGSSL_DIR=${lib.getDev boringssl'}"
"-DBORINGSSL_LIB_crypto=${lib.getLib boringssl'}/lib/libcrypto.a"
"-DBORINGSSL_LIB_ssl=${lib.getLib boringssl'}/lib/libssl.a"
"-DZLIB_LIB=${zlib}/lib/libz.so"
];
@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
mkdir combinedlib
cd combinedlib
ar -x ${boringssl'}/lib/libssl.a
ar -x ${boringssl'}/lib/libcrypto.a
ar -x ${lib.getLib boringssl'}/lib/libssl.a
ar -x ${lib.getLib boringssl'}/lib/libcrypto.a
ar -x ../src/liblsquic/liblsquic.a
ar rc liblsquic.a *.o
ranlib liblsquic.a