about summary refs log tree commit diff
path: root/pkgs/applications/audio/id3v2
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2015-04-19 03:29:31 +0200
committerTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2015-04-19 03:45:58 +0200
commitade440fa8467106c914b4a01b64880eb055a3a7c (patch)
tree3af3fc88bcab962f8362c2cfed6154e2d70bfd68 /pkgs/applications/audio/id3v2
parent63727ffcb2d859861c408c232f3a80bcbc453d92 (diff)
downloadnixlib-ade440fa8467106c914b4a01b64880eb055a3a7c.tar
nixlib-ade440fa8467106c914b4a01b64880eb055a3a7c.tar.gz
nixlib-ade440fa8467106c914b4a01b64880eb055a3a7c.tar.bz2
nixlib-ade440fa8467106c914b4a01b64880eb055a3a7c.tar.lz
nixlib-ade440fa8467106c914b4a01b64880eb055a3a7c.tar.xz
nixlib-ade440fa8467106c914b4a01b64880eb055a3a7c.tar.zst
nixlib-ade440fa8467106c914b4a01b64880eb055a3a7c.zip
id3v2 0.1.11 -> 0.1.12
Diffstat (limited to 'pkgs/applications/audio/id3v2')
-rw-r--r--pkgs/applications/audio/id3v2/default.nix20
-rw-r--r--pkgs/applications/audio/id3v2/id3v2-0.1.11-track-bad-free.patch14
2 files changed, 10 insertions, 24 deletions
diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix
index b96872c7ef0c..94c2cd810026 100644
--- a/pkgs/applications/audio/id3v2/default.nix
+++ b/pkgs/applications/audio/id3v2/default.nix
@@ -1,28 +1,28 @@
 {stdenv, fetchurl, id3lib, groff, zlib}:
 
+let version = "0.1.12"; in
 stdenv.mkDerivation rec {
-  name = "id3v2-0.1.11";
+  name = "id3v2-${version}";
   src = fetchurl {
     url = "mirror://sourceforge/id3v2/${name}.tar.gz";
-    sha256 = "00r6f9yzmkrqa62dnkm8njg5cjzhmy0l17nj1ba15nrrm0mnand4";
+    sha256 = "1gr22w8gar7zh5pyyvdy7cy26i47l57jp1l1nd60xfwx339zl1c1";
   };
 
-  patches = [ ./id3v2-0.1.11-track-bad-free.patch ];
-
   nativeBuildInputs = [ groff ];
   buildInputs = [ id3lib zlib ];
 
-  configurePhase = ''
-    export makeFlags=PREFIX=$out
-  '';
+  makeFlags = "PREFIX=$(out)";
+  buildFlags = "clean all";
 
   preInstall = ''
-    mkdir -p $out/bin $out/man/man1
+    mkdir -p $out/{bin,share/man/man1}
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
+    inherit version;
     description = "A command line editor for id3v2 tags";
     homepage = http://id3v2.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/applications/audio/id3v2/id3v2-0.1.11-track-bad-free.patch b/pkgs/applications/audio/id3v2/id3v2-0.1.11-track-bad-free.patch
deleted file mode 100644
index 3222fc7f41c1..000000000000
--- a/pkgs/applications/audio/id3v2/id3v2-0.1.11-track-bad-free.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://sourceforge.net/tracker/index.php?func=detail&aid=1252035&group_id=4193&atid=304193
-
-diff -up id3v2-0.1.11/id3v2.cpp~ id3v2-0.1.11/id3v2.cpp
---- id3v2-0.1.11/id3v2.cpp~	2004-05-04 21:30:15.000000000 +0300
-+++ id3v2-0.1.11/id3v2.cpp	2008-01-03 21:22:02.000000000 +0200
-@@ -423,7 +423,7 @@ int main( int argc, char *argv[])
-         {
-           // check if there is a total track number and if we only have 
-           // the track number for this file.  In this case combine them.
--          char *currentTrackNum, *newTrackNum;
-+          char *currentTrackNum, *newTrackNum = NULL;
- 
-           if (pFrame != NULL) 
-           {