diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:20:49 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:23:16 +0000 |
commit | 4999a38db7c5de0ea9f514a12ecd4133cce647f3 (patch) | |
tree | bbb659ab07fda4c9b98053499b7e3f046ac6d5dc /nixpkgs/pkgs/applications/networking/mumble | |
parent | f9abd30e11337cf07034f2cc8ad1691aa4a69386 (diff) | |
parent | 8746c77a383f5c76153c7a181f3616d273acfa2a (diff) | |
download | nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.gz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.bz2 nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.lz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.xz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.zst nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.zip |
Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a'
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/mumble')
-rw-r--r-- | nixpkgs/pkgs/applications/networking/mumble/default.nix | 66 |
1 files changed, 37 insertions, 29 deletions
diff --git a/nixpkgs/pkgs/applications/networking/mumble/default.nix b/nixpkgs/pkgs/applications/networking/mumble/default.nix index 321493682302..9f641061bd86 100644 --- a/nixpkgs/pkgs/applications/networking/mumble/default.nix +++ b/nixpkgs/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 @@ -14,7 +14,7 @@ assert iceSupport -> zeroc_ice != null; with stdenv.lib; let - generic = overrides: source: stdenv.mkDerivation (source // overrides // { + generic = overrides: source: (if source.qtVersion == 5 then qt5.mkDerivation else stdenv.mkDerivation) (source // overrides // { name = "${overrides.type}-${source.version}"; patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch; @@ -26,7 +26,7 @@ let # protobuf is freezed to 3.6 because of this bug: https://github.com/mumble-voip/mumble/issues/3617 # this could be reverted to the latest version in a future release of mumble as it is already fixed in master buildInputs = [ boost protobuf3_6 avahi ] - ++ { qt4 = [ qt4 ]; qt5 = [ qt5.qtbase ]; }."qt${toString source.qtVersion}" + ++ optional (source.qtVersion == 4) qt4 ++ (overrides.buildInputs or [ ]); qmakeFlags = [ @@ -45,20 +45,23 @@ let ++ (overrides.configureFlags or [ ]); preConfigure = '' - qmakeFlags="$qmakeFlags DEFINES+=PLUGIN_PATH=$out/lib" + qmakeFlags="$qmakeFlags DEFINES+=PLUGIN_PATH=$out/lib/mumble" patchShebangs scripts ''; makeFlags = [ "release" ]; installPhase = '' - mkdir -p $out/{lib,bin} - find release -type f -not -name \*.\* -exec cp {} $out/bin \; - find release -type f -name \*.\* -exec cp {} $out/lib \; + runHook preInstall + ${overrides.installPhase} + + # doc stuff mkdir -p $out/share/man/man1 - cp man/mum* $out/share/man/man1 - '' + (overrides.installPhase or ""); + install -Dm644 man/mum* $out/share/man/man1/ + + runHook postInstall + ''; enableParallelBuilding = true; @@ -74,7 +77,7 @@ let client = source: generic { type = "mumble"; - nativeBuildInputs = optionals (source.qtVersion == 5) [ qt5.qttools ]; + nativeBuildInputs = optional (source.qtVersion == 5) qt5.qttools; buildInputs = [ libopus libsndfile speex ] ++ optional (source.qtVersion == 5) qt5.qtsvg ++ optional stdenv.isLinux alsaLib @@ -89,12 +92,19 @@ let NIX_CFLAGS_COMPILE = optional speechdSupport "-I${speechd}/include/speech-dispatcher"; installPhase = '' - mkdir -p $out/share/applications - cp scripts/mumble.desktop $out/share/applications - - mkdir -p $out/share/icons{,/hicolor/scalable/apps} - cp icons/mumble.svg $out/share/icons - ln -s $out/share/icons/mumble.svg $out/share/icons/hicolor/scalable/apps + # bin stuff + install -Dm755 release/mumble $out/bin/mumble + install -Dm755 scripts/mumble-overlay $out/bin/mumble-overlay + + # lib stuff + mkdir -p $out/lib/mumble + cp -P release/libmumble.so* $out/lib + cp -P release/libcelt* $out/lib/mumble + cp -P release/plugins/* $out/lib/mumble + + # icons + install -Dm644 scripts/mumble.desktop $out/share/applications/mumble.desktop + install -Dm644 icons/mumble.svg $out/share/icons/hicolor/scalable/apps/mumble.svg ''; } source; @@ -110,6 +120,11 @@ let ]; buildInputs = [ libcap ] ++ optional iceSupport zeroc_ice; + + installPhase = '' + # bin stuff + install -Dm755 release/murmurd $out/bin/murmurd + ''; }; stableSource = rec { @@ -138,31 +153,24 @@ let ]; }; - gitSource = rec { - version = "2018-07-01"; + rcSource = rec { + version = "1.3.0-rc2"; qtVersion = 5; # Needs submodules src = fetchFromGitHub { owner = "mumble-voip"; repo = "mumble"; - rev = "c19ac8c0b0f934d2ff206858d7cb66352d6eb418"; - sha256 = "1mzp1bgn49ycs16d6r8icqq35wq25198fs084vyq6j5f78ni7pvz"; + rev = version; + sha256 = "00irlzz5q4drmsfbwrkyy7p7w8a5fc1ip5vyicq3g3cy58dprpqr"; fetchSubmodules = true; }; }; in { mumble = client stableSource; - mumble_git = client gitSource; + mumble_rc = client rcSource; murmur = server stableSource; - murmur_git = (server gitSource).overrideAttrs (old: { + murmur_rc = (server rcSource).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} - ''; }); } |