protobuf3: remove unnecessary null check

6 years ago · 65a81afcf5
parent 1f9188b708
commit 65a81afcf5
1 changed files with 1 additions and 2 deletions
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@ -29,8 +29,7 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec {
      --replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
  '';

-  nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc ]
-                      ++ (if buildProtobuf == null then [] else [ buildProtobuf ]);
+  nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc buildProtobuf ];

  buildInputs = [ zlib ];
  configureFlags = if buildProtobuf == null then [] else [ "--with-protoc=${buildProtobuf}/bin/protoc" ];