diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 12:03:24 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 12:03:24 -0400 |
| commit | ad838f6f91fcc89a2c9b1a6b85e7551181c30f95 (patch) | |
| tree | 886e434f1fc652b9c9afdcef725174dce0ef7aaa /pkgs/applications/version-management | |
| parent | c248aa40b1102e1d450c1730424d9048648ffc19 (diff) | |
| parent | 79adb993fbafeb89062e9b948e916d89311f7ca6 (diff) | |
| download | nixlib-ad838f6f91fcc89a2c9b1a6b85e7551181c30f95.tar nixlib-ad838f6f91fcc89a2c9b1a6b85e7551181c30f95.tar.gz nixlib-ad838f6f91fcc89a2c9b1a6b85e7551181c30f95.tar.bz2 nixlib-ad838f6f91fcc89a2c9b1a6b85e7551181c30f95.tar.lz nixlib-ad838f6f91fcc89a2c9b1a6b85e7551181c30f95.tar.xz nixlib-ad838f6f91fcc89a2c9b1a6b85e7551181c30f95.tar.zst nixlib-ad838f6f91fcc89a2c9b1a6b85e7551181c30f95.zip | |
Merge branch 'fewer-crossAttrs' into staging
Diffstat (limited to 'pkgs/applications/version-management')
| -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 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 = '' |