about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-04-24 18:49:22 +0300
committerNikolay Amiantov <ab@fmap.me>2016-04-24 18:49:33 +0300
commit73182fd328b40fedd2f81ab452a8a0ec01d0885c (patch)
tree687fc9789902d13883141ab1f757b86370d038f6 /pkgs/top-level
parentd1d4bd9a9dc5ee605ed5d06f815da4842b4c1ebe (diff)
downloadnixlib-73182fd328b40fedd2f81ab452a8a0ec01d0885c.tar
nixlib-73182fd328b40fedd2f81ab452a8a0ec01d0885c.tar.gz
nixlib-73182fd328b40fedd2f81ab452a8a0ec01d0885c.tar.bz2
nixlib-73182fd328b40fedd2f81ab452a8a0ec01d0885c.tar.lz
nixlib-73182fd328b40fedd2f81ab452a8a0ec01d0885c.tar.xz
nixlib-73182fd328b40fedd2f81ab452a8a0ec01d0885c.tar.zst
nixlib-73182fd328b40fedd2f81ab452a8a0ec01d0885c.zip
mumble_overlay: move from mumble and more fixes
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0d6690b3aec..0956dcf680c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13280,6 +13280,12 @@ in
       iceSupport = config.murmur.iceSupport or true;
     }) mumble mumble_git murmur murmur_git;
 
+  mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix {
+    mumble_i686 = if system == "x86_64-linux"
+      then pkgsi686Linux.mumble
+      else null;
+  };
+
   musescore = qt5.callPackage ../applications/audio/musescore { };
 
   mutt = callPackage ../applications/networking/mailreaders/mutt { };