ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

fossil: Remove crossAttrs

Browse Source 
TCC= (and BCC=) no longer needed as new Makefile defines with CC (and
CC_FOR_BUILD).
This commit is contained in:
John Ericson 2018-05-10 02:20:53 -04:00
parent ae429f8e55
commit a1f4d033dd
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/version-management/fossil/default.nix
View File

@ -1,5 +1,7 @@
{stdenv, libiconv, fetchurl, zlib, openssl, tcl, readline, sqlite, ed, which { stdenv
, tcllib, withJson ? true}: , libiconv, fetchurl, zlib, openssl, tcl, readline, sqlite, ed, which
, tcllib, withJson ? true
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fossil-${version}"; name = "fossil-${version}";
@ -18,11 +20,11 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional stdenv.isDarwin libiconv; ++ stdenv.lib.optional stdenv.isDarwin libiconv;
nativeBuildInputs = [ tcl ]; nativeBuildInputs = [ tcl ];
doCheck = true; doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
checkTarget = "test"; checkTarget = "test";
preCheck = '' preCheck = stdenv.lib.optional doCheck ''
export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}"
''; '';
configureFlags = if withJson then "--json" else ""; configureFlags = if withJson then "--json" else "";
@ -36,11 +38,6 @@ stdenv.mkDerivation rec {
INSTALLDIR=$out/bin make install INSTALLDIR=$out/bin make install
''; '';
crossAttrs = {
doCheck = false;
makeFlags = [ "TCC=$CC" ];
};
meta = { meta = {
description = "Simple, high-reliability, distributed software configuration management"; description = "Simple, high-reliability, distributed software configuration management";
longDescription = '' longDescription = ''