From 83f923b1305772aa3c318c95f9e271a9c16c15e6 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sun, 24 Mar 2024 23:47:18 +0100 Subject: mumble: 1.4.287 -> 1.5.634 Signed-off-by: Felix Singer --- pkgs/applications/networking/mumble/default.nix | 30 ++++--------------------- 1 file changed, 4 insertions(+), 26 deletions(-) (limited to 'pkgs/applications/networking/mumble/default.nix') diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index ab10d4add74d0..b72e218ddcfb7 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -19,17 +19,6 @@ let pname = overrides.type; version = source.version; - patches = [ - ./0001-BUILD-crypto-Migrate-to-OpenSSL-3.0-compatible-API.patch - # fix crash caused by openssl3 thread unsafe evp implementation - # see https://github.com/mumble-voip/mumble/issues/5361#issuecomment-1173001440 - (fetchpatch { - url = "https://github.com/mumble-voip/mumble/commit/f8d47db318f302f5a7d343f15c9936c7030c49c4.patch"; - hash = "sha256-xk8vBrPwvQxHCY8I6WQJAyaBGHmlH9NCixweP6FyakU="; - }) - ./0002-FIX-positional-audio-Force-8-bytes-alignment-for-CCa.patch - ]; - nativeBuildInputs = [ cmake pkg-config python3 qt5.wrapQtAppsHook qt5.qttools ] ++ (overrides.nativeBuildInputs or [ ]); @@ -72,11 +61,11 @@ let "-D bundled-celt=ON" "-D bundled-opus=OFF" "-D bundled-speex=OFF" - "-D bundled-rnnoise=OFF" "-D bundle-qt-translations=OFF" "-D update=OFF" "-D overlay-xcompile=OFF" "-D oss=OFF" + "-D warnings-as-errors=OFF" # conversion error workaround ] ++ lib.optional (!speechdSupport) "-D speechd=OFF" ++ lib.optional (!pulseSupport) "-D pulseaudio=OFF" ++ lib.optional (!pipewireSupport) "-D pipewire=OFF" @@ -107,27 +96,16 @@ let } source; source = rec { - version = "1.4.287"; + version = "1.5.634"; # Needs submodules src = fetchFromGitHub { owner = "mumble-voip"; repo = "mumble"; - rev = "5d808e287e99b402b724e411a7a0848e00956a24"; - sha256 = "sha256-SYsGCuj3HeyAQRUecGLaRdJR9Rm7lbaM54spY/zx0jU="; + rev = "v${version}"; + sha256 = "sha256-d9XmXHq264rTT80zphYcKLxS+AyUhjb19D3DuBJvMI4="; fetchSubmodules = true; }; - - patches = [ - # fixes 'static assertion failed: static_assert(sizeof(CCameraAngles) == 0x408, "");' - # when compiling pkgsi686Linux.mumble, which is a dependency of x64 mumble_overlay - # https://github.com/mumble-voip/mumble/pull/5850 - # Remove with next version update - (fetchpatch { - url = "https://github.com/mumble-voip/mumble/commit/13c051b36b387356815cff5d685bc628b74ba136.patch"; - hash = "sha256-Rq8fb6NFd4DCNWm6OOMYIP7tBllufmQcB5CSxPU4qqg="; - }) - ]; }; in { mumble = client source; -- cgit 1.4.1