From f028f77abe3faad0a2883ea10deca614d93cbc84 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 15 Oct 2018 14:30:45 +0200 Subject: [PATCH] Revert "protobuf3: support cross compilation" --- pkgs/development/libraries/protobuf/generic-v3.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 883dff56f2ee..79e4c387cdf5 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -1,12 +1,11 @@ { stdenv , fetchFromGitHub -, autoreconfHook, zlib, gmock, which, buildPackages +, autoreconfHook, zlib, gmock , version, sha256 , ... }: -let -mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "protobuf-${version}"; # make sure you test also -A pythonPackages.protobuf @@ -29,10 +28,8 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec { --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; - nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc buildProtobuf ]; - + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib ]; - configureFlags = if buildProtobuf == null then [] else [ "--with-protoc=${buildProtobuf}/bin/protoc" ]; enableParallelBuilding = true; @@ -57,7 +54,4 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec { }; passthru.version = version; -}; -in mkProtobufDerivation(if (stdenv.buildPlatform != stdenv.hostPlatform) - then (mkProtobufDerivation null buildPackages.stdenv) - else null) stdenv +}