From f30f36104b92f4e578157c003ea93f05409353e6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 3 Mar 2008 10:55:20 +0000 Subject: [PATCH] * Added Audacious, a fork of beep-media-player (which doesn't seem to work very well after the Glibc update), plus its dependencies. TODO: make an audacious-wrapper that lets Audacious find its plugins automatically. Currently you have to install audacious-plugins and symlink ~/.nix-profile/lib/audacious/* in ~/.local/share/audacious/Plugins. svn path=/nixpkgs/trunk/; revision=10927 --- pkgs/applications/audio/audacious/player.nix | 32 +++++++++++++++++++ pkgs/applications/audio/audacious/plugins.nix | 29 +++++++++++++++++ pkgs/development/libraries/libmcs/default.nix | 17 ++++++++++ .../libraries/libmowgli/default.nix | 15 +++++++++ .../libraries/libmpcdec/default.nix | 6 ++-- pkgs/top-level/all-packages.nix | 26 ++++++++++++--- pkgs/top-level/build-for-release.nix | 5 ++- 7 files changed, 120 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/audio/audacious/player.nix create mode 100644 pkgs/applications/audio/audacious/plugins.nix create mode 100644 pkgs/development/libraries/libmcs/default.nix create mode 100644 pkgs/development/libraries/libmowgli/default.nix diff --git a/pkgs/applications/audio/audacious/player.nix b/pkgs/applications/audio/audacious/player.nix new file mode 100644 index 000000000000..5c301d59574a --- /dev/null +++ b/pkgs/applications/audio/audacious/player.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig, glib, gtk, libmowgli +, libglade, libmcs, gettext, xlibs, dbus_glib +}: + +stdenv.mkDerivation { + name = "audacious-1.4.6"; + + src = fetchurl { + url = http://distfiles.atheme.org/audacious-1.4.6.tbz2; + sha256 = "0n4za82xlh3nfvfk0hq81bmh0sx233gxq8xj68jzalmbijsnbs0l"; + }; + + buildInputs = [pkgconfig libglade libmcs gettext dbus_glib]; + + propagatedBuildInputs = [glib gtk libmowgli libmcs]; + + NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib"; + + # Otherwise we barf with "libgcc_s.so.1 must be installed for + # pthread_cancel to work" on exit, as it tries to find libgcc_s + # dynamically. + dontPatchELF = true; + + preBuild = '' + ensureDir $out/lib + ''; + + meta = { + description = "Audacious, a media player forked from the Beep Media Player, which was itself an XMMS fork"; + homepage = http://audacious-media-player.org/; + }; +} diff --git a/pkgs/applications/audio/audacious/plugins.nix b/pkgs/applications/audio/audacious/plugins.nix new file mode 100644 index 000000000000..1abcacaf9593 --- /dev/null +++ b/pkgs/applications/audio/audacious/plugins.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, audacious, dbus_glib, gettext +, libmad, xlibs, alsaLib, taglib, libmpcdec, libogg, libvorbis +}: + +stdenv.mkDerivation { + name = "audacious-plugins-1.4.5"; + + src = fetchurl { + url = http://distfiles.atheme.org/audacious-plugins-1.4.5.tbz2; + sha256 = "145dn2x1rldwbaxnl19j7cw338fs9fwcn607r8gk01adfy3warxq"; + }; + + buildInputs = [ + pkgconfig audacious dbus_glib gettext libmad + xlibs.libXcomposite alsaLib taglib libmpcdec + libogg libvorbis + ]; + + preBuild = '' + makeFlagsArray=(pluginlibdir=$out/lib/audacious) + ''; + + NIX_LDFLAGS = "-L${audacious}/lib/audacious"; # needed because we override pluginlibdir + + meta = { + description = "Plugins for the Audacious media player"; + homepage = http://audacious-media-player.org/; + }; +} diff --git a/pkgs/development/libraries/libmcs/default.nix b/pkgs/development/libraries/libmcs/default.nix new file mode 100644 index 000000000000..1f6d45e14055 --- /dev/null +++ b/pkgs/development/libraries/libmcs/default.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl, pkgconfig, libmowgli}: + +stdenv.mkDerivation { + name = "libmcs-0.7.0"; + + src = fetchurl { + url = http://distfiles.atheme.org/libmcs-0.7.0.tgz; + sha256 = "11qjrxxgk0yvqm668dyaj54kgijcnkaid8dld8lf4br2glmz2jy5"; + }; + + buildInputs = [pkgconfig 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; + }; +} diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix new file mode 100644 index 000000000000..c3e7c7d694d0 --- /dev/null +++ b/pkgs/development/libraries/libmowgli/default.nix @@ -0,0 +1,15 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "libmowgli-0.6.1"; + + src = fetchurl { + url = http://distfiles.atheme.org/libmowgli-0.6.1.tgz; + sha256 = "0bhxgyx6c913pyiib768qmsi059dnq1zj3k2nik9976hy5yd8m0l"; + }; + + meta = { + description = "A development framework for C providing high performance and highly flexible algorithms"; + homepage = http://www.atheme.org/projects/mowgli.shtml; + }; +} diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/development/libraries/libmpcdec/default.nix index f0742d23229a..2916b00eea7c 100644 --- a/pkgs/development/libraries/libmpcdec/default.nix +++ b/pkgs/development/libraries/libmpcdec/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libmpcdec-1.2.2"; + name = "libmpcdec-1.2.6"; src = fetchurl { - url = http://files2.musepack.net/source/libmpcdec-1.2.2.tar.bz2; - md5 = "f14e07285b9b102a806649074c1d779b"; + url = http://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2; + md5 = "7f7a060e83b4278acf4b77d7a7b9d2c0"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cccb4da63a1b..09db9cabda22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2634,13 +2634,21 @@ rec { })); libksba = import ../development/libraries/libksba { - inherit fetchurl stdenv libgpgerror; + inherit fetchurl stdenv libgpgerror; }; libmad = import ../development/libraries/libmad { inherit fetchurl stdenv; }; + libmcs = import ../development/libraries/libmcs { + inherit fetchurl stdenv pkgconfig libmowgli; + }; + + libmowgli = import ../development/libraries/libmowgli { + inherit fetchurl stdenv; + }; + libmpcdec = import ../development/libraries/libmpcdec { inherit fetchurl stdenv; }; @@ -2650,7 +2658,7 @@ rec { }; libnova = import ../development/libraries/libnova { - inherit fetchurl stdenv; + inherit fetchurl stdenv; }; libogg = import ../development/libraries/libogg { @@ -2664,7 +2672,6 @@ rec { liboil = liboilFun null; - liboop = import ../development/libraries/liboop { inherit fetchurl stdenv; }; @@ -2788,7 +2795,7 @@ rec { inherit fetchurl stdenv; }; -#failed to build + # failed to build mediastreamerFun = lib.sumArgs (selectVersion ../development/libraries/mediastreamer "2.2.0-cvs20080207") { inherit fetchurl stdenv automake libtool autoconf alsaLib pkgconfig speex @@ -4564,6 +4571,17 @@ rec { libstdcpp = gcc33.gcc; }; + audacious = import ../applications/audio/audacious/player.nix { + inherit fetchurl stdenv pkgconfig libmowgli libmcs gettext xlibs dbus_glib; + inherit (gnome) libglade; + inherit (gtkLibs) glib gtk; + }; + + audacious_plugins = import ../applications/audio/audacious/plugins.nix { + inherit fetchurl stdenv pkgconfig audacious dbus_glib gettext + libmad xlibs alsaLib taglib libmpcdec libogg libvorbis; + }; + audacity = import ../applications/audio/audacity { inherit fetchurl stdenv libogg libvorbis libsndfile libmad pkgconfig gettext; diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix index 83f72bab4dcc..e3bc3815faf6 100644 --- a/pkgs/top-level/build-for-release.nix +++ b/pkgs/top-level/build-for-release.nix @@ -12,6 +12,8 @@ let aspell aspellDicts aterm + audacious + audacious_plugins autoconf automake19x bash @@ -20,9 +22,6 @@ let binutils bison23 bittorrent - bmp - bmp_plugin_musepack - bmp_plugin_wma bsdiff bzip2 cabextract