diff options
| author | ryan4729 <ryan4729@example.com> | 2018-10-15 03:13:20 -0700 |
|---|---|---|
| committer | ryan4729 <ryan4729@example.com> | 2018-10-15 03:13:20 -0700 |
| commit | 65a81afcf5ef9bc96c21089b370bece300849977 (patch) | |
| tree | 8f7105816dc668b1f7cc7ba2667f159fffdd1779 /pkgs | |
| parent | 1f9188b708da7d2ea973a840ac086e6542ed0d2a (diff) | |
| download | nixlib-65a81afcf5ef9bc96c21089b370bece300849977.tar nixlib-65a81afcf5ef9bc96c21089b370bece300849977.tar.gz nixlib-65a81afcf5ef9bc96c21089b370bece300849977.tar.bz2 nixlib-65a81afcf5ef9bc96c21089b370bece300849977.tar.lz nixlib-65a81afcf5ef9bc96c21089b370bece300849977.tar.xz nixlib-65a81afcf5ef9bc96c21089b370bece300849977.tar.zst nixlib-65a81afcf5ef9bc96c21089b370bece300849977.zip | |
protobuf3: remove unnecessary null check
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/protobuf/generic-v3.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 43e5e5d799d1..883dff56f2ee 100644 --- 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" ]; |