mumble-overlay: just build it the upstream way (#359620)

pkgs/applications/networking/mumble/default.nix

@@ -7,6 +7,7 @@
 , flac
 , libogg
 , libvorbis
+, stdenv_32bit
 , iceSupport ? true, zeroc-ice
 , jackSupport ? false, libjack2
 , pipewireSupport ? true, pipewire
@@ -15,7 +16,7 @@
 }:
 
 let
-  generic = overrides: source: stdenv.mkDerivation (source // overrides // {
+  generic = overrides: source: (overrides.stdenv or stdenv).mkDerivation (source // overrides // {
     pname = overrides.type;
     version = source.version;
 
@@ -95,6 +96,17 @@ let
       ++ lib.optional iceSupport zeroc-ice;
   } source;
 
+  overlay = source: generic {
+    stdenv = stdenv_32bit;
+    type = "mumble-overlay";
+
+    configureFlags = [
+      "-D server=OFF"
+      "-D client=OFF"
+      "-D overlay=ON"
+    ];
+  } source;
+
   source = rec {
     version = "1.5.634";
 
@@ -118,4 +130,5 @@ let
 in {
   mumble  = lib.recursiveUpdate (client source) {meta.mainProgram = "mumble";};
   murmur  = lib.recursiveUpdate (server source) {meta.mainProgram = "mumble-server";};
+  overlay = overlay source;
 }

pkgs/applications/networking/mumble/overlay.nix

@@ -1,30 +0,0 @@
-{ stdenv, lib, which, file, mumble, mumble_i686
-}:
-
-let
-  binPath = lib.makeBinPath [ which file ];
-in stdenv.mkDerivation {
-  pname = "mumble-overlay";
-  version = mumble.version;
-
-  inherit (mumble) src;
-  patches = mumble.patches or [];
-
-  installPhase = ''
-    mkdir -p $out/lib
-    ln -s ${mumble}/lib/libmumble.so.1 $out/lib/
-
-    ${lib.optionalString (mumble_i686 != null) ''
-      mkdir -p $out/lib32
-      ln -s ${mumble_i686}/lib/libmumble.so.1 $out/lib32/
-    ''}
-
-    install -Dm755 auxiliary_files/run_scripts/mumble-overlay.in $out/bin/mumble-overlay
-    sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay
-    sed -i '2iPATH="${binPath}:$PATH"' $out/bin/mumble-overlay
-  '';
-
-  meta = {
-    platforms = lib.platforms.linux;
-  };
-}

pkgs/top-level/all-packages.nix

@@ -15001,11 +15001,7 @@ with pkgs;
       speechdSupport = config.mumble.speechdSupport or false;
     }).mumble;
 
-  mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix {
-    mumble_i686 = if stdenv.hostPlatform.system == "x86_64-linux"
-      then pkgsi686Linux.mumble
-      else null;
-  };
+  mumble_overlay = (callPackages ../applications/networking/mumble {}).overlay;
 
   mup = callPackage ../applications/audio/mup {
     autoreconfHook = buildPackages.autoreconfHook269;