diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-24 11:28:20 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-12-17 14:45:46 +0100 |
| commit | 5a129a8121f455e79fd1ae90ce941a690a053f14 (patch) | |
| tree | be0272b737ca20ca42687a67ea8b899ce84b050a | |
| parent | 6538905eb42b2129c71612dc15e3ce2522907f72 (diff) | |
libffi: doCheck optionally and do so for glib-tested
This is kind-of reverting fcf99efcd.
| -rw-r--r-- | pkgs/development/libraries/libffi/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 824b909f1d911..9c2334f38db8b 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, dejagnu, doCheck ? false }: stdenv.mkDerivation rec { name = "libffi-3.2.1"; @@ -10,11 +10,15 @@ stdenv.mkDerivation rec { patches = if stdenv.isCygwin then [ ./3.2.1-cygwin.patch ] else null; + buildInputs = stdenv.lib.optional doCheck dejagnu; + configureFlags = [ "--with-gcc-arch=generic" # no detection of -march= or -mtune= "--enable-pax_emutramp" ]; + inherit doCheck; + dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling. # Install headers in the right place. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e759dba84eebc..fc95924320f80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6659,7 +6659,10 @@ let }; glib = callPackage ../development/libraries/glib { }; - glib-tested = glib.override { doCheck = true; }; # checked version separate to break cycles + glib-tested = glib.override { # checked version separate to break cycles + doCheck = true; + libffi = libffi.override { doCheck = true; }; + }; glibmm = callPackage ../development/libraries/glibmm { }; glib_networking = callPackage ../development/libraries/glib-networking {}; |