diff options
author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-12-27 21:44:24 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-27 21:44:24 +0300 |
commit | aa18f24f4b29e978de25817de1b087f145a14b66 (patch) | |
tree | 6f331cc35c8941aaf144dbeb204ec0b0e914e66a /pkgs/top-level | |
parent | cfbe501d4ecb6173be204e68a0d7b5e8f52086e8 (diff) | |
parent | 7e54f35d65737f55525f8328dd9309bdb93b5ff9 (diff) | |
download | nixlib-aa18f24f4b29e978de25817de1b087f145a14b66.tar nixlib-aa18f24f4b29e978de25817de1b087f145a14b66.tar.gz nixlib-aa18f24f4b29e978de25817de1b087f145a14b66.tar.bz2 nixlib-aa18f24f4b29e978de25817de1b087f145a14b66.tar.lz nixlib-aa18f24f4b29e978de25817de1b087f145a14b66.tar.xz nixlib-aa18f24f4b29e978de25817de1b087f145a14b66.tar.zst nixlib-aa18f24f4b29e978de25817de1b087f145a14b66.zip |
Merge pull request #21269 from non-Jedi/mm
mm: init at 2016.11.04
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9c86813cf10..e6a3cd97a17b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14014,6 +14014,8 @@ in normalize = callPackage ../applications/audio/normalize { }; + mm = callPackage ../applications/networking/instant-messengers/mm { }; + mplayer = callPackage ../applications/video/mplayer ({ pulseSupport = config.pulseaudio or false; libdvdnav = libdvdnav_4_2_1; |