Merge #31111: remove libmcs

This commit is contained in:
Vladimír Čunát 2017-11-02 00:10:42 +01:00
commit bb6257bd3a
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
4 changed files with 4 additions and 25 deletions

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3 { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3
, libmowgli, libmcs, dbus_glib, libxml2, xorg, gnome3, alsaLib , libmowgli, dbus_glib, libxml2, xorg, gnome3, alsaLib
, libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis , libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis
, libcdio082, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b , libcdio082, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b
, libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack , libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gettext glib gtk3 libmowgli libmcs dbus_glib libxml2 gettext glib gtk3 libmowgli dbus_glib libxml2
xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2 xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2
libpulseaudio fluidsynth libmad libogg libvorbis libcdio082 libpulseaudio fluidsynth libmad libogg libvorbis libcdio082
libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile

View File

@ -3,7 +3,7 @@
gettext, pkgconfig, gettext, pkgconfig,
qtbase, qtbase,
alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b, alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b,
libcddb, libcdio082, libcue, libjack2, libmad, libmcs, libmms, libmodplug, libcddb, libcdio082, libcue, libjack2, libmad, libmms, libmodplug,
libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp,
libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr,
wavpack wavpack
@ -39,7 +39,7 @@ mkDerivation {
# Plugin dependencies # Plugin dependencies
alsaLib curl faad2 ffmpeg flac fluidsynth gdk_pixbuf lame libbs2b libcddb alsaLib curl faad2 ffmpeg flac fluidsynth gdk_pixbuf lame libbs2b libcddb
libcdio082 libcue libjack2 libmad libmcs libmms libmodplug libmowgli libcdio082 libcue libjack2 libmad libmms libmodplug libmowgli
libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile
libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack
]; ];

View File

@ -1,19 +0,0 @@
{ stdenv, fetchurl, pkgconfig, libmowgli }:
stdenv.mkDerivation rec {
name = "libmcs-0.7.2";
src = fetchurl {
url = "http://distfiles.atheme.org/${name}.tbz2";
sha256 = "1knmgxrg2kxdlin8qyf6351943ldg8myllwf860af58x1wncxc74";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libmowgli ];
meta = {
description = "A library and set of userland tools which abstract the storage of configuration settings away from userland applications";
homepage = http://www.atheme.org/projects/mcs.shtml;
platforms = stdenv.lib.platforms.unix;
};
}

View File

@ -9384,8 +9384,6 @@ with pkgs;
libmatroska = callPackage ../development/libraries/libmatroska { }; libmatroska = callPackage ../development/libraries/libmatroska { };
libmcs = callPackage ../development/libraries/libmcs { };
libmd = callPackage ../development/libraries/libmd { }; libmd = callPackage ../development/libraries/libmd { };
libmemcached = callPackage ../development/libraries/libmemcached { }; libmemcached = callPackage ../development/libraries/libmemcached { };