From bddb71a1383d306261d3df00eae9f04baf04554c Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Wed, 1 Nov 2017 22:43:38 +0100 Subject: [PATCH 1/2] audacious: drop unneeded libmcs input --- pkgs/applications/audio/audacious/default.nix | 4 ++-- pkgs/applications/audio/audacious/qt-5.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 6d4b18e29b0..8242d035e5b 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,5 +1,5 @@ { 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 , libcdio082, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b , libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gettext glib gtk3 libmowgli libmcs dbus_glib libxml2 + gettext glib gtk3 libmowgli dbus_glib libxml2 xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2 libpulseaudio fluidsynth libmad libogg libvorbis libcdio082 libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix index da143c7d946..803b0115fbd 100644 --- a/pkgs/applications/audio/audacious/qt-5.nix +++ b/pkgs/applications/audio/audacious/qt-5.nix @@ -3,7 +3,7 @@ gettext, pkgconfig, qtbase, 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, libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, wavpack @@ -39,7 +39,7 @@ mkDerivation { # Plugin dependencies 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 libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack ]; From e2e8d5905552f7db44e6bd22516a56d46ffc97f3 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Wed, 1 Nov 2017 22:48:05 +0100 Subject: [PATCH 2/2] libmcs: 0.7.2 -> deprecated --- pkgs/development/libraries/libmcs/default.nix | 19 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 21 deletions(-) delete mode 100644 pkgs/development/libraries/libmcs/default.nix diff --git a/pkgs/development/libraries/libmcs/default.nix b/pkgs/development/libraries/libmcs/default.nix deleted file mode 100644 index a457adfed80..00000000000 --- a/pkgs/development/libraries/libmcs/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa4488b9317..8fd266caa5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9384,8 +9384,6 @@ with pkgs; libmatroska = callPackage ../development/libraries/libmatroska { }; - libmcs = callPackage ../development/libraries/libmcs { }; - libmd = callPackage ../development/libraries/libmd { }; libmemcached = callPackage ../development/libraries/libmemcached { };