From 08f68313a47a2093dc0f408a706b2c125bc59c95 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 13 Aug 2019 21:52:01 +0000
Subject: treewide: remove redundant rec

---
 pkgs/applications/video/avxsynth/default.nix       | 2 +-
 pkgs/applications/video/byzanz/default.nix         | 2 +-
 pkgs/applications/video/coriander/default.nix      | 2 +-
 pkgs/applications/video/devede/default.nix         | 2 +-
 pkgs/applications/video/kodi/default.nix           | 2 +-
 pkgs/applications/video/kodi/plugins.nix           | 6 +++---
 pkgs/applications/video/lightworks/default.nix     | 2 +-
 pkgs/applications/video/mjpg-streamer/default.nix  | 2 +-
 pkgs/applications/video/mplayer/default.nix        | 2 +-
 pkgs/applications/video/recordmydesktop/gtk.nix    | 2 +-
 pkgs/applications/video/recordmydesktop/qt.nix     | 2 +-
 pkgs/applications/video/subdl/default.nix          | 2 +-
 pkgs/applications/video/subtitleeditor/default.nix | 2 +-
 pkgs/applications/video/uvccapture/default.nix     | 2 +-
 pkgs/applications/video/vdr/plugins.nix            | 2 +-
 pkgs/applications/video/xscast/default.nix         | 2 +-
 16 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'pkgs/applications/video')

diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix
index 3d5980863296..f16f655b95db 100644
--- a/pkgs/applications/video/avxsynth/default.nix
+++ b/pkgs/applications/video/avxsynth/default.nix
@@ -7,7 +7,7 @@ let
   inherit (stdenv.lib) enableFeature optional;
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "avxsynth";
   version = "2015-04-07";
 
diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix
index 0f1b185ed220..10685a72f109 100644
--- a/pkgs/applications/video/byzanz/default.nix
+++ b/pkgs/applications/video/byzanz/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1, xorg }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   version = "0.2.3.alpha";
   pname = "byzanz";
 
diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix
index 10a8f4019fca..a2de52468f29 100644
--- a/pkgs/applications/video/coriander/default.nix
+++ b/pkgs/applications/video/coriander/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, pkgconfig, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394
 , SDL, automake, GConf }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "coriander-2.0.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix
index d614523f5345..388476cbf8e7 100644
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@@ -4,7 +4,7 @@
 let
   inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3;
 
-in buildPythonApplication rec {
+in buildPythonApplication {
   name = "devede-4.8.8";
   namePrefix = "";
 
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 73bcdadbc594..f022722584cd 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -143,7 +143,7 @@ let
     postPatch         = cmakeProtoPatch;
   };
 
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
     name = "kodi-${lib.optionalString useWayland "wayland-"}${kodiVersion}";
 
     src = kodi_src;
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 7bb905fecd86..dad52ccb9a7c 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -51,7 +51,7 @@ let self = rec {
   };
 
   mkKodiPlugin = { plugin, namespace, version, sourceDir ? null, ... }@args:
-  toKodiPlugin (stdenv.mkDerivation (rec {
+  toKodiPlugin (stdenv.mkDerivation ({
     name = "kodi-plugin-${plugin}-${version}";
 
     dontStrip = true;
@@ -70,7 +70,7 @@ let self = rec {
 
   mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [],
     extraRuntimeDependencies ? [], extraInstallPhase ? "", ... }@args:
-  toKodiPlugin (stdenv.mkDerivation (rec {
+  toKodiPlugin (stdenv.mkDerivation ({
     name = "kodi-plugin-${plugin}-${version}";
 
     dontStrip = true;
@@ -310,7 +310,7 @@ let self = rec {
 
   };
 
-  steam-launcher = mkKodiPlugin rec {
+  steam-launcher = mkKodiPlugin {
 
     plugin = "steam-launcher";
     namespace = "script.steam.launcher";
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index 0dc97410f547..1ab7e2c991b9 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -76,7 +76,7 @@ let
   };
 
 # Lightworks expects some files in /usr/share/lightworks
-in buildFHSUserEnv rec {
+in buildFHSUserEnv {
   name = lightworks.name;
 
   targetPkgs = pkgs: [
diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix
index 14db747d2ce7..d1efae4a9244 100644
--- a/pkgs/applications/video/mjpg-streamer/default.nix
+++ b/pkgs/applications/video/mjpg-streamer/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, libjpeg }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "mjpg-streamer";
   version = "unstable-2019-05-24";
 
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index c77486a30cf1..28f734fa7ee7 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -88,7 +88,7 @@ let
 
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "mplayer-1.3.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/video/recordmydesktop/gtk.nix b/pkgs/applications/video/recordmydesktop/gtk.nix
index d59b02d4b0ae..cf02825501f5 100644
--- a/pkgs/applications/video/recordmydesktop/gtk.nix
+++ b/pkgs/applications/video/recordmydesktop/gtk.nix
@@ -4,7 +4,7 @@
 let
   binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ];
 
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
   pname = "gtk-recordmydesktop";
   version = "0.3.8-svn${recordmydesktop.rev}";
 
diff --git a/pkgs/applications/video/recordmydesktop/qt.nix b/pkgs/applications/video/recordmydesktop/qt.nix
index 0864edfcf38e..573a18f62ce9 100644
--- a/pkgs/applications/video/recordmydesktop/qt.nix
+++ b/pkgs/applications/video/recordmydesktop/qt.nix
@@ -4,7 +4,7 @@
 let
   binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ];
 
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
   pname = "qt-recordmydesktop";
   version = "0.3.8-svn${recordmydesktop.rev}";
 
diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/applications/video/subdl/default.nix
index 32bd731f16e9..36a92f0f1afb 100644
--- a/pkgs/applications/video/subdl/default.nix
+++ b/pkgs/applications/video/subdl/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, python3 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "subdl-0.0pre.2017.11.06";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix
index 03fc1f5399af..7396b3d6e7a2 100644
--- a/pkgs/applications/video/subtitleeditor/default.nix
+++ b/pkgs/applications/video/subtitleeditor/default.nix
@@ -7,7 +7,7 @@ let
   version = "0.54.0";
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "subtitleeditor";
   inherit version;
 
diff --git a/pkgs/applications/video/uvccapture/default.nix b/pkgs/applications/video/uvccapture/default.nix
index dd595baa52e8..f52ffa923d28 100644
--- a/pkgs/applications/video/uvccapture/default.nix
+++ b/pkgs/applications/video/uvccapture/default.nix
@@ -8,7 +8,7 @@ let
 
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "uvccapture-0.5";
 
   src = fetchurl {
diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix
index 022f4382a492..2ee196baccc7 100644
--- a/pkgs/applications/video/vdr/plugins.nix
+++ b/pkgs/applications/video/vdr/plugins.nix
@@ -201,7 +201,7 @@ in {
 
   };
 
-  text2skin = stdenv.mkDerivation rec {
+  text2skin = stdenv.mkDerivation {
     name = "vdr-text2skin-1.3.4-20170702";
 
     src = fetchgit {
diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix
index ba72763cdaf2..3c4c59a0ee8f 100644
--- a/pkgs/applications/video/xscast/default.nix
+++ b/pkgs/applications/video/xscast/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, makeWrapper, ffmpeg, imagemagick, dzen2, xorg }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "xscast-unstable";
   version = "2016-07-26";
 
-- 
cgit 1.4.1