about summary refs log tree commit diff
path: root/pkgs/development/libraries/gdbm
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-01-14 21:18:27 +0200
committerTuomas Tynkkynen <tuomas@tuxera.com>2018-01-14 21:18:27 +0200
commit6ed0fe7e450def967685ec11b789bfe32002d1c1 (patch)
tree409bf318be731969061398dc5a11c5d3c360484f /pkgs/development/libraries/gdbm
parentc08042ba4b507cc0d494b1b9ca0895cc25db83d4 (diff)
parentb986078593af4108371c210ce0106b6b3e82ee20 (diff)
downloadnixlib-6ed0fe7e450def967685ec11b789bfe32002d1c1.tar
nixlib-6ed0fe7e450def967685ec11b789bfe32002d1c1.tar.gz
nixlib-6ed0fe7e450def967685ec11b789bfe32002d1c1.tar.bz2
nixlib-6ed0fe7e450def967685ec11b789bfe32002d1c1.tar.lz
nixlib-6ed0fe7e450def967685ec11b789bfe32002d1c1.tar.xz
nixlib-6ed0fe7e450def967685ec11b789bfe32002d1c1.tar.zst
nixlib-6ed0fe7e450def967685ec11b789bfe32002d1c1.zip
Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/build-support/fetchbower/default.nix
	pkgs/build-support/fetchdarcs/default.nix
	pkgs/build-support/fetchgx/default.nix
	pkgs/development/python-modules/botocore/default.nix
	pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
	pkgs/tools/admin/awscli/default.nix
Diffstat (limited to 'pkgs/development/libraries/gdbm')
-rw-r--r--pkgs/development/libraries/gdbm/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix
index 8d645bde7770..310aaa430daf 100644
--- a/pkgs/development/libraries/gdbm/default.nix
+++ b/pkgs/development/libraries/gdbm/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "02dakgrq93xwgln8qfv3vs5jyz5yvds5nyzkx6rhg9v585x478dd";
   };
 
-  doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
+  doCheck = true; # not cross;
 
   # Linking static stubs on cygwin requires correct ordering.
   # Consider upstreaming this.