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

Merge pull request #204714 from wegank/invidious-darwin

Browse Source 
invidious: fix build on aarch64-darwin
This commit is contained in:
Sandro 2022-12-16 10:28:41 +01:00 committed by GitHub
commit 650469a6cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/servers/invidious/default.nix
View File

@ -115,6 +115,5 @@ crystal.buildCrystalPackage rec {
homepage = "https://invidious.io/"; homepage = "https://invidious.io/";
license = licenses.agpl3; license = licenses.agpl3;
maintainers = with maintainers; [ infinisil sbruder ]; maintainers = with maintainers; [ infinisil sbruder ];
broken = stdenv.isDarwin && stdenv.isAarch64;
}; };
} }

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

@ -54,8 +54,7 @@ let
}) })
]; ];
preBuild = '' preBuild = preBuild + lib.optionalString stdenv.isLinux ''
${preBuild}
sed -e '/^build crypto\/fipsmodule\/CMakeFiles\/fipsmodule\.dir\/bcm\.c\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=stringop-overflow/' \ sed -e '/^build crypto\/fipsmodule\/CMakeFiles\/fipsmodule\.dir\/bcm\.c\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=stringop-overflow/' \
-i build.ninja -i build.ninja
''; '';
@ -73,6 +72,11 @@ stdenv.mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace ".so" "${stdenv.hostPlatform.extensions.sharedLibrary}"
'';
nativeBuildInputs = [ cmake perl ]; nativeBuildInputs = [ cmake perl ];
buildInputs = [ boringssl' libevent zlib ]; buildInputs = [ boringssl' libevent zlib ];