From 12ededf3d84dc3b4e1cf4845655c56fabfc8d5d2 Mon Sep 17 00:00:00 2001
From: ryan4729 <ryan4729@example.com>
Date: Mon, 15 Oct 2018 01:57:47 -0700
Subject: [PATCH] protobuf3: fix parameter naming

---
 pkgs/development/libraries/protobuf/3.1.nix        | 5 ++---
 pkgs/development/libraries/protobuf/3.4.nix        | 5 ++---
 pkgs/development/libraries/protobuf/3.5.nix        | 5 ++---
 pkgs/development/libraries/protobuf/3.6.nix        | 5 ++---
 pkgs/development/libraries/protobuf/generic-v3.nix | 6 +++---
 pkgs/top-level/all-packages.nix                    | 8 ++++----
 6 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/protobuf/3.1.nix b/pkgs/development/libraries/protobuf/3.1.nix
index 2af2d547d70..79e3711ff10 100644
--- a/pkgs/development/libraries/protobuf/3.1.nix
+++ b/pkgs/development/libraries/protobuf/3.1.nix
@@ -1,8 +1,7 @@
-{ callPackage, externalProtoc, buildProtobuf, ... }:
+{ callPackage, useExternalProtoc, buildProtobuf, ... }:
 
 callPackage ./generic-v3.nix {
   version = "3.1.0";
   sha256 = "0qlvpsmqgh9nw0k4zrxlxf75pafi3p0ahz99v6761b903y8qyv4i";
-  externalProtoc = externalProtoc;
-  buildProtobuf = buildProtobuf;
+  inherit useExternalProtoc buildProtobuf;
 }
diff --git a/pkgs/development/libraries/protobuf/3.4.nix b/pkgs/development/libraries/protobuf/3.4.nix
index c7e4153b2bc..a80517250f5 100644
--- a/pkgs/development/libraries/protobuf/3.4.nix
+++ b/pkgs/development/libraries/protobuf/3.4.nix
@@ -1,8 +1,7 @@
-{ callPackage, lib, externalProtoc, buildProtobuf, ... }:
+{ callPackage, lib, useExternalProtoc, buildProtobuf, ... }:
 
 lib.overrideDerivation (callPackage ./generic-v3.nix {
   version = "3.4.1";
   sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb";
-  externalProtoc = externalProtoc;
-  buildProtobuf = buildProtobuf;
+  inherit useExternalProtoc buildProtobuf;
 }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })
diff --git a/pkgs/development/libraries/protobuf/3.5.nix b/pkgs/development/libraries/protobuf/3.5.nix
index 2313067a2ac..8558e60a5e8 100644
--- a/pkgs/development/libraries/protobuf/3.5.nix
+++ b/pkgs/development/libraries/protobuf/3.5.nix
@@ -1,8 +1,7 @@
-{ callPackage, lib, externalProtoc, buildProtobuf, ... }:
+{ callPackage, lib, useExternalProtoc, buildProtobuf, ... }:
 
 lib.overrideDerivation (callPackage ./generic-v3.nix {
   version = "3.5.1.1";
   sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk";
-  externalProtoc = externalProtoc;
-  buildProtobuf = buildProtobuf;
+  inherit useExternalProtoc buildProtobuf;
 }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })
diff --git a/pkgs/development/libraries/protobuf/3.6.nix b/pkgs/development/libraries/protobuf/3.6.nix
index b52cbbfe06e..a3fac7eb064 100644
--- a/pkgs/development/libraries/protobuf/3.6.nix
+++ b/pkgs/development/libraries/protobuf/3.6.nix
@@ -1,8 +1,7 @@
-{ callPackage, externalProtoc, buildProtobuf, ... }:
+{ callPackage, useExternalProtoc, buildProtobuf, ... }:
 
 callPackage ./generic-v3.nix {
   version = "3.6.1";
   sha256 = "1bg40miylzpy2wgbd7l7zjgmk43l12q38fq0zkn0vzy1lsj457sq";
-  externalProtoc = externalProtoc;
-  buildProtobuf = buildProtobuf;
+  inherit useExternalProtoc buildProtobuf;
 }
diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index c810558a070..3db4571d8ba 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -1,7 +1,7 @@
 { stdenv
 , fetchFromGitHub
 , autoreconfHook, zlib, gmock, which, buildPackages
-, externalProtoc
+, useExternalProtoc
 , buildProtobuf ? null
 , version, sha256
 , ...
@@ -31,10 +31,10 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc ]
-                      ++ stdenv.lib.optional externalProtoc [ buildProtobuf ];
+                      ++ stdenv.lib.optional useExternalProtoc [ buildProtobuf ];
 
   buildInputs = [ zlib ];
-  configureFlags = stdenv.lib.optional externalProtoc [ "--with-protoc=${buildProtobuf}/bin/protoc" ];
+  configureFlags = stdenv.lib.optional useExternalProtoc [ "--with-protoc=${buildProtobuf}/bin/protoc" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fff2cd66f0..65e11ac6532 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11727,25 +11727,25 @@ with pkgs;
   protobuf = protobuf3_6;
 
   protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix {
-    externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
+    useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
     buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
                     then buildPackages.protobuf3_6
                     else null;
   };
   protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix {
-    externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
+    useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
     buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
                     then buildPackages.protobuf3_5
                     else null;
   };
   protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix {
-    externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
+    useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
     buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
                     then buildPackages.protobuf3_4
                     else null;
   };
   protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix {
-    externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
+    useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
     buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
                     then buildPackages.protobuf3_1
                     else null;