JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #48461 from NixOS/revert-48450-proto3-cross

Browse Source 
Revert "protobuf3: support cross compilation"

Merged too hastily to master even though it's a mass rebuild.
This commit is contained in:
Linus Heckemann 2018-10-15 14:31:15 +02:00 committed by GitHub
commit aa4dd3898b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/protobuf/generic-v3.nix
View File

@ -1,12 +1,11 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, autoreconfHook, zlib, gmock, which, buildPackages , autoreconfHook, zlib, gmock
, version, sha256 , version, sha256
, ... , ...
}: }:
let stdenv.mkDerivation rec {
mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec {
name = "protobuf-${version}"; name = "protobuf-${version}";
# make sure you test also -A pythonPackages.protobuf # make sure you test also -A pythonPackages.protobuf
@ -29,10 +28,8 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec {
--replace 'tmpnam(b)' '"'$TMPDIR'/foo"' --replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
''; '';
nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc buildProtobuf ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ zlib ]; buildInputs = [ zlib ];
configureFlags = if buildProtobuf == null then [] else [ "--with-protoc=${buildProtobuf}/bin/protoc" ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -57,7 +54,4 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec {
}; };
passthru.version = version; passthru.version = version;
}; }
in mkProtobufDerivation(if (stdenv.buildPlatform != stdenv.hostPlatform)
then (mkProtobufDerivation null buildPackages.stdenv)
else null) stdenv