Merge pull request #131688 from Stunkymonkey/tools-pname-version1

tools/{X11/video/virtualization} replace name with pname&version

4 files changed, 10 insertions, 6 deletions

diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix
index 18088eb6c3087..9f4b8832f390f 100644
--- a/pkgs/tools/video/dvgrab/default.nix
+++ b/pkgs/tools/video/dvgrab/default.nix
@@ -2,7 +2,8 @@
 , libavc1394, pkg-config, autoreconfHook }:
 
 stdenv.mkDerivation {
-  name = "dvgrab-2016-05-16";
+  pname = "dvgrab";
+  version = "2016-05-16";
 
   src = fetchFromGitHub {
     # mirror of original project with some build fixes
diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix
index 45f63dc7727d5..29dad791bc692 100644
--- a/pkgs/tools/video/mjpegtools/default.nix
+++ b/pkgs/tools/video/mjpegtools/default.nix
@@ -8,10 +8,11 @@
 # - libXxf86dga support? checking for XF86DGAQueryExtension in -lXxf86dga... no
 
 stdenv.mkDerivation rec {
-  name = "mjpegtools-2.1.0";
+  pname = "mjpegtools";
+  version = "2.1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/mjpeg/${name}.tar.gz";
+    url = "mirror://sourceforge/mjpeg/mjpegtools-${version}.tar.gz";
     sha256 = "01y4xpfdvd4zgv6fmcjny9mr1gbfd4y2i4adp657ydw6fqyi8kw6";
   };
 
diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix
index c5e777f7531e9..dbad79e61ad1d 100644
--- a/pkgs/tools/video/swfmill/default.nix
+++ b/pkgs/tools/video/swfmill/default.nix
@@ -3,10 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "swfmill-0.3.3";
+  pname = "swfmill";
+  version = "0.3.3";
 
   src = fetchurl {
-    url = "http://swfmill.org/releases/${name}.tar.gz";
+    url = "http://swfmill.org/releases/swfmill-${version}.tar.gz";
     sha256 = "15mcpql448vvgsbxs7wd0vdk1ln6rdcpnif6i2zjm5l4xng55s7r";
   };
 
diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix
index 5a60fc4c5d2ec..02608ac16b206 100644
--- a/pkgs/tools/video/vncrec/default.nix
+++ b/pkgs/tools/video/vncrec/default.nix
@@ -3,7 +3,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "vncrec-0.2"; # version taken from Arch AUR
+  pname = "vncrec";
+  version = "0.2"; # version taken from Arch AUR
 
   src = fetchurl {
     url = "http://ronja.twibright.com/utils/vncrec-twibright.tgz";