diff options
| author | Peter Simons <simons@cryp.to> | 2013-03-25 13:43:45 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-03-25 13:43:45 +0100 |
| commit | 0823aea0a60e65c2d6de77f827b8142f333035bc (patch) | |
| tree | df752d62bef0ef00e8cd3e9e98f86ccfd4c30a68 /pkgs/development/tools/build-managers | |
| parent | a28ff44c761d7a3a032ee5293f2e649446908a1b (diff) | |
| parent | 1764ea2b0a635587746d382db1b6cd832483a362 (diff) | |
| download | nixlib-0823aea0a60e65c2d6de77f827b8142f333035bc.tar nixlib-0823aea0a60e65c2d6de77f827b8142f333035bc.tar.gz nixlib-0823aea0a60e65c2d6de77f827b8142f333035bc.tar.bz2 nixlib-0823aea0a60e65c2d6de77f827b8142f333035bc.tar.lz nixlib-0823aea0a60e65c2d6de77f827b8142f333035bc.tar.xz nixlib-0823aea0a60e65c2d6de77f827b8142f333035bc.tar.zst nixlib-0823aea0a60e65c2d6de77f827b8142f333035bc.zip | |
Merge branch 'master' into stdenv-updates.
Conflicts: pkgs/development/libraries/libxslt/default.nix Commit 1764ea2b0a635587746d382db1b6cd832483a362 introduced changes to libxslt in an awkward way to avoid re-builds on Linux. This patch has been simplified during this merge.
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/gnumake/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index 731664f99132..4f3c7defa488 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { /* On Darwin, there are 3 test failures that haven't been investigated yet. */ - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD; patches = [ |