diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 02:20:53 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 11:42:13 -0400 |
| commit | a1f4d033ddc30a17a982f0f5a2a3497d766c63ae (patch) | |
| tree | f4d4fef9c2cb358e32e3c5d3a063b608f6f7172b | |
| parent | ae429f8e5527263240b21e7641b84a7e7d6898d7 (diff) | |
| download | nixpkgs-a1f4d033ddc30a17a982f0f5a2a3497d766c63ae.tar nixpkgs-a1f4d033ddc30a17a982f0f5a2a3497d766c63ae.tar.gz nixpkgs-a1f4d033ddc30a17a982f0f5a2a3497d766c63ae.tar.bz2 nixpkgs-a1f4d033ddc30a17a982f0f5a2a3497d766c63ae.tar.lz nixpkgs-a1f4d033ddc30a17a982f0f5a2a3497d766c63ae.tar.xz nixpkgs-a1f4d033ddc30a17a982f0f5a2a3497d766c63ae.tar.zst nixpkgs-a1f4d033ddc30a17a982f0f5a2a3497d766c63ae.zip | |
fossil: Remove crossAttrs
TCC= (and BCC=) no longer needed as new Makefile defines with CC (and CC_FOR_BUILD).
| -rw-r--r-- | pkgs/applications/version-management/fossil/default.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index f46a704ea9c..1373e13c414 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 = '' |