diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-12-16 10:28:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-16 10:28:41 +0100 |
| commit | 650469a6cf0a8408bc8a819f36280e7a0c497bc1 (patch) | |
| tree | 3c9c909912140ca3d3fbfbc9abb1e5b147f02a98 /pkgs/servers/invidious | |
| parent | c737ee25f3cec6a4c6a93f4eb85c0deb80724ff5 (diff) | |
| parent | 1d3a9a9601021f1a81a6d22f3dd83c3e47b70f30 (diff) | |
Merge pull request #204714 from wegank/invidious-darwin
invidious: fix build on aarch64-darwin
Diffstat (limited to 'pkgs/servers/invidious')
| -rw-r--r-- | pkgs/servers/invidious/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/servers/invidious/lsquic.nix | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/servers/invidious/default.nix b/pkgs/servers/invidious/default.nix index 8b9138e0a4cb1..b3b0d2d47ad0b 100644 --- a/pkgs/servers/invidious/default.nix +++ b/pkgs/servers/invidious/default.nix @@ -115,6 +115,5 @@ crystal.buildCrystalPackage rec { homepage = "https://invidious.io/"; license = licenses.agpl3; maintainers = with maintainers; [ infinisil sbruder ]; - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/servers/invidious/lsquic.nix b/pkgs/servers/invidious/lsquic.nix index ca04c97c12800..c2c88dd8e3b87 100644 --- a/pkgs/servers/invidious/lsquic.nix +++ b/pkgs/servers/invidious/lsquic.nix @@ -54,8 +54,7 @@ let }) ]; - preBuild = '' - ${preBuild} + preBuild = preBuild + lib.optionalString stdenv.isLinux '' sed -e '/^build crypto\/fipsmodule\/CMakeFiles\/fipsmodule\.dir\/bcm\.c\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=stringop-overflow/' \ -i build.ninja ''; @@ -73,6 +72,11 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace ".so" "${stdenv.hostPlatform.extensions.sharedLibrary}" + ''; + nativeBuildInputs = [ cmake perl ]; buildInputs = [ boringssl' libevent zlib ]; |