From 5a129a8121f455e79fd1ae90ce941a690a053f14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 24 Sep 2015 11:28:20 +0200 Subject: [PATCH] libffi: doCheck optionally and do so for glib-tested This is kind-of reverting fcf99efcd. --- pkgs/development/libraries/libffi/default.nix | 6 +++++- 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 824b909f1d91..9c2334f38db8 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 e759dba84eeb..fc95924320f8 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 {};