Add version attribute where maintainers |= nckx

This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.

1 files changed, 15 insertions, 16 deletions

diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index 9ae200abebb2..f9d887189ec9 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -2,9 +2,9 @@
 # "Free" API key generated by nckx <tobias.geerinckx.rice@gmail.com>
 , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:
 
-let version = "2.4"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "minitube-${version}";
+  version = "2.4";
 
   src = fetchFromGitHub {
     sha256 = "0mm8v2vpspwxh2fqaykb381v6r9apywc1b0x8jkcbp7s43w10lp5";
@@ -13,20 +13,6 @@ stdenv.mkDerivation {
     owner = "flaviotordini";
   };
 
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "Stand-alone YouTube video player";
-    longDescription = ''
-      Watch YouTube videos in a new way: you type a keyword, Minitube gives
-      you an endless video stream. Minitube is not about cloning the YouTube
-      website, it aims to create a new TV-like experience.
-    '';
-    homepage = http://flavio.tordini.org/minitube;
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ phonon phonon_backend_vlc qt4 ];
   nativeBuildInputs = [ makeWrapper ];
 
@@ -40,4 +26,17 @@ stdenv.mkDerivation {
     wrapProgram $out/bin/minitube \
       --prefix QT_PLUGIN_PATH : "${phonon_backend_vlc}/lib/kde4/plugins"
   '';
+
+  meta = with stdenv.lib; {
+    description = "Stand-alone YouTube video player";
+    longDescription = ''
+      Watch YouTube videos in a new way: you type a keyword, Minitube gives
+      you an endless video stream. Minitube is not about cloning the YouTube
+      website, it aims to create a new TV-like experience.
+    '';
+    homepage = http://flavio.tordini.org/minitube;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
 }