c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

mumble: 1.5.857 -> 1.5.901

Browse source 
Signed-off-by: Felix Singer <felixsinger@posteo.net>
This commit is contained in:
Felix Singer 2026-05-22 16:07:24 +02:00
commit fd1177cced
2 changed files with 4 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/networking/mumble/default.nix
View file

@ -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;
};
};

21
pkgs/applications/networking/mumble/disable-overlay-build.patch
View file

@ -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)