From 46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Thu, 15 Aug 2019 12:41:18 +0000
Subject: treewide: name -> pname (easy cases) (#66585)

treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
---
 pkgs/tools/video/atomicparsley/default.nix | 2 +-
 pkgs/tools/video/bento4/default.nix        | 2 +-
 pkgs/tools/video/rtmpdump/default.nix      | 2 +-
 pkgs/tools/video/swftools/default.nix      | 4 ++--
 pkgs/tools/video/untrunc/default.nix       | 2 +-
 pkgs/tools/video/yamdi/default.nix         | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'pkgs/tools/video')

diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix
index 711a3c00a122..b136e9c5ab75 100644
--- a/pkgs/tools/video/atomicparsley/default.nix
+++ b/pkgs/tools/video/atomicparsley/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchhg, autoreconfHook, zlib, Cocoa }:
 
 stdenv.mkDerivation rec {
-  name = "atomicparsley-${version}";
+  pname = "atomicparsley";
   version = "0.9.6";
 
   src = fetchhg {
diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix
index 4f5a348b144e..5594143bfbce 100644
--- a/pkgs/tools/video/bento4/default.nix
+++ b/pkgs/tools/video/bento4/default.nix
@@ -2,7 +2,7 @@
 , cmake
 }:
 stdenv.mkDerivation rec {
-  name = "bento4-${version}";
+  pname = "bento4";
   version = "1.5.1-628";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix
index 8be028730377..af56ba3e7ebb 100644
--- a/pkgs/tools/video/rtmpdump/default.nix
+++ b/pkgs/tools/video/rtmpdump/default.nix
@@ -10,7 +10,7 @@ assert opensslSupport -> openssl != null && !gnutlsSupport;
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "rtmpdump-${version}";
+  pname = "rtmpdump";
   version = "2015-12-30";
 
   src = fetchgit {
diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix
index a50c7539fe05..d75405ab309f 100644
--- a/pkgs/tools/video/swftools/default.nix
+++ b/pkgs/tools/video/swftools/default.nix
@@ -2,11 +2,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "swftools-${version}";
+  pname = "swftools";
   version = "0.9.2";
 
   src = fetchurl {
-    url = "http://www.swftools.org/${name}.tar.gz";
+    url = "http://www.swftools.org/${pname}-${version}.tar.gz";
     sha256 = "1w81dyi81019a6jmnm5z7fzarswng27lg1d4k4d5llxzqszr2s5z";
   };
 
diff --git a/pkgs/tools/video/untrunc/default.nix b/pkgs/tools/video/untrunc/default.nix
index c51c23d62f02..a87015ecf96b 100644
--- a/pkgs/tools/video/untrunc/default.nix
+++ b/pkgs/tools/video/untrunc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, gcc, libav_12, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "untrunc-${version}";
+  pname = "untrunc";
   version = "2018.01.13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/video/yamdi/default.nix b/pkgs/tools/video/yamdi/default.nix
index e995f9e3a4f6..8fca318529ff 100644
--- a/pkgs/tools/video/yamdi/default.nix
+++ b/pkgs/tools/video/yamdi/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "yamdi-${version}";
+  pname = "yamdi";
   version = "1.9";
 
   # Source repo is also available here:
-- 
cgit v1.2.3