diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 50759da2fd1a..9a5730580cb1 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -78,6 +78,7 @@ let "-D bundled-gsl=OFF" "-D bundled-json=OFF" "-D warnings-as-errors=OFF" # protobuf 34.x `[[nodiscard]]` workaround https://github.com/mumble-voip/mumble/issues/7102 + "-D use-timestamps=OFF" ] ++ (overrides.cmakeFlags or [ ]); @@ -151,7 +152,6 @@ let env.NIX_CFLAGS_COMPILE = lib.optionalString speechdSupport "-I${speechd-minimal}/include/speech-dispatcher"; patches = [ - ./disable-overlay-build.patch ./fix-plugin-copy.patch ]; @@ -165,6 +165,7 @@ let --source-dir=$NIX_BUILD_TOP/source/ \ --binary-dir=$out \ --only-appbundle \ + --no-overlay \ --version "${source.version}" mkdir -p $out/Applications $out/bin @@ -216,14 +217,14 @@ let } source; source = rec { - version = "1.5.857"; + version = "1.5.901"; # Needs submodules src = fetchFromGitHub { owner = "mumble-voip"; repo = "mumble"; tag = "v${version}"; - hash = "sha256-4ySak2nzT8p48waMgBc9kLrvFB8716e7p0G4trzuh1k="; + hash = "sha256-UBJH7EwfWvInuSD6ZALOKeVnWdfh/rmq8GVLG5URjOQ="; fetchSubmodules = true; }; }; diff --git a/pkgs/applications/networking/mumble/disable-overlay-build.patch b/pkgs/applications/networking/mumble/disable-overlay-build.patch deleted file mode 100644 index 9d2aff0d8da0..000000000000 --- a/pkgs/applications/networking/mumble/disable-overlay-build.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/macx/scripts/osxdist.py b/macx/scripts/osxdist.py -index bdc7fcbd2..2114caf37 100755 ---- a/macx/scripts/osxdist.py -+++ b/macx/scripts/osxdist.py -@@ -128,7 +128,7 @@ class AppBundle(object): - shutil.copy(rsrc, os.path.join(rsrcpath, b)) - - # Extras -- shutil.copy(os.path.join(options.binary_dir, 'MumbleOverlay.pkg'), os.path.join(rsrcpath, 'MumbleOverlay.pkg')) -+ # shutil.copy(os.path.join(options.binary_dir, 'MumbleOverlay.pkg'), os.path.join(rsrcpath, 'MumbleOverlay.pkg')) - - def copy_codecs(self): - ''' -@@ -275,7 +276,7 @@ def package_client(): - title = 'Mumble %s' % ver - - # Fix overlay installer package -- create_overlay_package() -+ # create_overlay_package() - if options.only_overlay: - sys.exit(0)