forked from mirrors/nixpkgs
protobuf3: remove unnecessary null check
This commit is contained in:
parent
1f9188b708
commit
65a81afcf5
|
@ -29,8 +29,7 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec {
|
||||||
--replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
|
--replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc ]
|
nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc buildProtobuf ];
|
||||||
++ (if buildProtobuf == null then [] else [ buildProtobuf ]);
|
|
||||||
|
|
||||||
buildInputs = [ zlib ];
|
buildInputs = [ zlib ];
|
||||||
configureFlags = if buildProtobuf == null then [] else [ "--with-protoc=${buildProtobuf}/bin/protoc" ];
|
configureFlags = if buildProtobuf == null then [] else [ "--with-protoc=${buildProtobuf}/bin/protoc" ];
|
||||||
|
|
Loading…
Reference in a new issue