summary refs log tree commit diff
path: root/pkgs/applications/networking/mumble
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2019-07-05 10:42:08 -0500
committerThomas Tuegel <ttuegel@mailbox.org>2019-07-05 10:42:08 -0500
commit51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2 (patch)
tree0b9751f2bfd16a70e406b420c34a8d4097ad9492 /pkgs/applications/networking/mumble
parentf79fd2e826dd95b3b64839d3e0bec8ae1dfab17e (diff)
downloadnixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar
nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.gz
nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.bz2
nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.lz
nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.xz
nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.zst
nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.zip
wrapQtAppsHook: Remove ad hoc Qt wrappers
Diffstat (limited to 'pkgs/applications/networking/mumble')
-rw-r--r--pkgs/applications/networking/mumble/default.nix9
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 32149368230..56e98e880f7 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper, pkgconfig
+{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig
 , qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf3_6, speex, libcap
 , alsaLib, python
 , jackSupport ? false, libjack2 ? null
@@ -158,11 +158,6 @@ in {
   murmur_git = (server gitSource).overrideAttrs (old: {
     meta = old.meta // { broken = iceSupport; };
 
-    nativeBuildInputs = old.nativeBuildInputs or [] ++ [ makeWrapper ];
-
-    installPhase = old.installPhase or "" + ''
-      wrapProgram $out/bin/murmurd --suffix QT_PLUGIN_PATH : \
-        ${getBin qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}
-    '';
+    nativeBuildInputs = old.nativeBuildInputs or [] ++ [ qt5.wrapQtAppsHook ];
   });
 }