diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2019-08-01 00:12:51 +0300 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2019-08-01 23:06:13 +0000 |
| commit | 17d29239b835353259c5506fbd37ff6676044a9c (patch) | |
| tree | cc1f2ce3dcbc6318aeff3444e3e3f083153288a4 /pkgs/top-level | |
| parent | 44884cdf291d8436fb473907994bda65450de468 (diff) | |
| download | nixlib-17d29239b835353259c5506fbd37ff6676044a9c.tar nixlib-17d29239b835353259c5506fbd37ff6676044a9c.tar.gz nixlib-17d29239b835353259c5506fbd37ff6676044a9c.tar.bz2 nixlib-17d29239b835353259c5506fbd37ff6676044a9c.tar.lz nixlib-17d29239b835353259c5506fbd37ff6676044a9c.tar.xz nixlib-17d29239b835353259c5506fbd37ff6676044a9c.tar.zst nixlib-17d29239b835353259c5506fbd37ff6676044a9c.zip | |
mumble: refactor and fix Qt 5 version
* Use -rc version instead of a git checkout. Rename derivation accordingly; * Change PLUGIN_PATH similar to Arch; * Fix install phase so that random files aren't installed and plugins use separate directory; * Use linkSoVersions to remove duplicate libraries.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fe3f18519137..e8e16489b3b8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -416,6 +416,10 @@ mapAliases ({ gst-plugins-good = pkgs.gst-plugins-good; gst-plugins-ugly = pkgs.gst-plugins-ugly; }; + + # added 2019-08-01 + mumble_git = pkgs.mumble_rc; + murmur_git = pkgs.murmur_rc; } // (with ocaml-ng; { # added 2016-09-14 ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml; ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bb749d5aefb..2b83e829154c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19428,7 +19428,7 @@ in speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; - }) mumble mumble_git murmur; + }) mumble mumble_rc murmur; inherit (callPackages ../applications/networking/mumble { avahi = avahi-compat; @@ -19436,7 +19436,7 @@ in speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or false; iceSupport = false; - }) murmur_git; + }) murmur_rc; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { mumble_i686 = if stdenv.hostPlatform.system == "x86_64-linux" |