JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

taglib{,-extras}: use buildNativeInputs, meta

Browse Source 
svn path=/nixpkgs/trunk/; revision=31329
This commit is contained in:
Yury G. Kudryashov 2012-01-05 23:43:22 +00:00
parent c22e6aadc5
commit ba80f4337f
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/taglib-extras/default.nix
View File

@ -1,10 +1,11 @@
{stdenv, fetchurl, cmake, taglib}: {stdenv, fetchurl, cmake, taglib}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "taglib-extras-1.0.1"; name = "taglib-extras-1.0.1";
src = fetchurl { src = fetchurl {
url = http://www.kollide.net/~jefferai/taglib-extras-1.0.1.tar.gz; url = "http://www.kollide.net/~jefferai/${name}.tar.gz";
sha256 = "0cln49ws9svvvals5fzxjxlzqm0fzjfymn7yfp4jfcjz655nnm7y"; sha256 = "0cln49ws9svvvals5fzxjxlzqm0fzjfymn7yfp4jfcjz655nnm7y";
}; };
buildInputs = [ cmake taglib ]; buildInputs = [ taglib ];
buildNativeInputs = [ cmake ];
} }

9
pkgs/development/libraries/taglib/default.nix
View File

@ -1,19 +1,22 @@
{stdenv, fetchurl, zlib, cmake}: {stdenv, fetchurl, zlib, cmake}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "taglib-1.7.0"; name = "taglib-1.7";
src = fetchurl { src = fetchurl {
url = "https://github.com/downloads/taglib/taglib/taglib-1.7.tar.gz"; url = "http://developer.kde.org/~wheeler/files/src/${name}.tar.gz";
sha256 = "0gvpmfrrh4wgdpyc14zq9mk3hivp8kbmfdxjk8bi2nf3py6zpph9"; sha256 = "0gvpmfrrh4wgdpyc14zq9mk3hivp8kbmfdxjk8bi2nf3py6zpph9";
}; };
cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON"; cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON";
buildInputs = [zlib cmake]; buildInputs = [zlib];
buildNativeInputs = [cmake];
meta = { meta = {
homepage = http://developer.kde.org/~wheeler/taglib.html; homepage = http://developer.kde.org/~wheeler/taglib.html;
description = "A library for reading and editing the meta-data of several popular audio formats"; description = "A library for reading and editing the meta-data of several popular audio formats";
inherit (cmake.meta) platforms;
maintainers = [ stdenv.lib.maintainers.urkud ];
}; };
} }