From a1f4d033ddc30a17a982f0f5a2a3497d766c63ae Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 May 2018 02:20:53 -0400 Subject: [PATCH] fossil: Remove crossAttrs TCC= (and BCC=) no longer needed as new Makefile defines with CC (and CC_FOR_BUILD). --- .../version-management/fossil/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index f46a704ea9ca..1373e13c4147 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,5 +1,7 @@ -{stdenv, libiconv, fetchurl, zlib, openssl, tcl, readline, sqlite, ed, which -, tcllib, withJson ? true}: +{ stdenv +, libiconv, fetchurl, zlib, openssl, tcl, readline, sqlite, ed, which +, tcllib, withJson ? true +}: stdenv.mkDerivation rec { name = "fossil-${version}"; @@ -18,11 +20,11 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin libiconv; nativeBuildInputs = [ tcl ]; - doCheck = true; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; checkTarget = "test"; - preCheck = '' + preCheck = stdenv.lib.optional doCheck '' export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" ''; configureFlags = if withJson then "--json" else ""; @@ -36,11 +38,6 @@ stdenv.mkDerivation rec { INSTALLDIR=$out/bin make install ''; - crossAttrs = { - doCheck = false; - makeFlags = [ "TCC=$CC" ]; - }; - meta = { description = "Simple, high-reliability, distributed software configuration management"; longDescription = ''