diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-23 09:13:17 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-23 09:13:17 +0000 |
commit | 766ff9059e3a90936d60477d2f50a254a3b1921c (patch) | |
tree | f659d36df5fee801dbdce58ed4c4d8c748df3920 /pkgs | |
parent | ffdf59a99d461ce54364b77822f352626e0eb542 (diff) | |
download | nixlib-766ff9059e3a90936d60477d2f50a254a3b1921c.tar nixlib-766ff9059e3a90936d60477d2f50a254a3b1921c.tar.gz nixlib-766ff9059e3a90936d60477d2f50a254a3b1921c.tar.bz2 nixlib-766ff9059e3a90936d60477d2f50a254a3b1921c.tar.lz nixlib-766ff9059e3a90936d60477d2f50a254a3b1921c.tar.xz nixlib-766ff9059e3a90936d60477d2f50a254a3b1921c.tar.zst nixlib-766ff9059e3a90936d60477d2f50a254a3b1921c.zip |
* WMA plugin for BMP.
svn path=/nixpkgs/trunk/; revision=6798
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/audio/bmp-plugins/musepack/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/bmp-plugins/wma/builder.sh | 11 | ||||
-rw-r--r-- | pkgs/applications/audio/bmp-plugins/wma/default.nix | 11 | ||||
-rw-r--r-- | pkgs/applications/audio/bmp/default.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/build-for-release.nix | 1 |
6 files changed, 32 insertions, 5 deletions
diff --git a/pkgs/applications/audio/bmp-plugins/musepack/default.nix b/pkgs/applications/audio/bmp-plugins/musepack/default.nix index b333948b5c67..9b553dc1988b 100644 --- a/pkgs/applications/audio/bmp-plugins/musepack/default.nix +++ b/pkgs/applications/audio/bmp-plugins/musepack/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, bmp, glib, gtk, libmpcdec, taglib}: +{stdenv, fetchurl, pkgconfig, bmp, libmpcdec, taglib}: stdenv.mkDerivation { name = "bmp-plugin-musepack-1.2"; @@ -7,5 +7,5 @@ stdenv.mkDerivation { url = http://nix.cs.uu.nl/dist/tarballs/bmp-musepack-1.2.tar.bz2; md5 = "5fe0c9d341ca37d05c780a478f829a5f"; }; - buildInputs = [pkgconfig bmp glib gtk libmpcdec taglib]; + buildInputs = [pkgconfig bmp libmpcdec taglib]; } diff --git a/pkgs/applications/audio/bmp-plugins/wma/builder.sh b/pkgs/applications/audio/bmp-plugins/wma/builder.sh new file mode 100644 index 000000000000..686242677a48 --- /dev/null +++ b/pkgs/applications/audio/bmp-plugins/wma/builder.sh @@ -0,0 +1,11 @@ +source $stdenv/setup + +makeFlags="-f Makefile.bmp" + +installPhase=installPhase +installPhase() { + ensureDir "$out/lib/bmp/Input" + cp libwma.so "$out/lib/bmp/Input" +} + +genericBuild diff --git a/pkgs/applications/audio/bmp-plugins/wma/default.nix b/pkgs/applications/audio/bmp-plugins/wma/default.nix new file mode 100644 index 000000000000..2812f4ce280f --- /dev/null +++ b/pkgs/applications/audio/bmp-plugins/wma/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl, pkgconfig, bmp}: + +stdenv.mkDerivation { + name = "bmp-plugin-wma-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = http://mcmcc.bat.ru/xmms-wma/xmms-wma-1.0.5.tar.bz2; + md5 = "5d62a0f969617aeb40096362c7a8a506"; + }; + buildInputs = [pkgconfig bmp]; +} diff --git a/pkgs/applications/audio/bmp/default.nix b/pkgs/applications/audio/bmp/default.nix index 1dc06d699878..03dc5546c0c4 100644 --- a/pkgs/applications/audio/bmp/default.nix +++ b/pkgs/applications/audio/bmp/default.nix @@ -10,11 +10,12 @@ stdenv.mkDerivation { }; buildInputs = [ - pkgconfig alsaLib esound libogg libvorbis id3lib - glib gtk libglade + pkgconfig alsaLib esound libogg libvorbis id3lib libglade ]; meta = { description = "Beep Media Player, an XMMS fork"; }; + + propagatedBuildInputs = [glib gtk]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9aab7302a7f5..ee45b6c1fa45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2284,7 +2284,10 @@ rec { bmp_plugin_musepack = import ../applications/audio/bmp-plugins/musepack { inherit fetchurl stdenv pkgconfig bmp libmpcdec taglib; - inherit (gtkLibs) glib gtk; + }; + + bmp_plugin_wma = import ../applications/audio/bmp-plugins/wma { + inherit fetchurl stdenv pkgconfig bmp; }; cdparanoiaIII = import ../applications/audio/cdparanoia { diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix index 87795641d584..78f712fea4d8 100644 --- a/pkgs/top-level/build-for-release.nix +++ b/pkgs/top-level/build-for-release.nix @@ -20,6 +20,7 @@ let { blackdown bmp bmp_plugin_musepack + bmp_plugin_wma bsdiff bzip2 chatzilla |