public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libffi: doCheck optionally and do so for glib-tested 

This is kind-of reverting fcf99efcd.
This commit is contained in:
Vladimír Čunát 2015-09-24 11:28:20 +02:00
parent 6538905eb4
commit 5a129a8121
2 changed files with 9 additions and 2 deletions
pkgs
development/libraries/libffi
default.nix
top-level
all-packages.nix

6
pkgs/development/libraries/libffi/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv }: { fetchurl, stdenv, dejagnu, doCheck ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libffi-3.2.1"; name = "libffi-3.2.1";
@ -10,11 +10,15 @@ stdenv.mkDerivation rec {
patches = if stdenv.isCygwin then [ ./3.2.1-cygwin.patch ] else null; patches = if stdenv.isCygwin then [ ./3.2.1-cygwin.patch ] else null;
buildInputs = stdenv.lib.optional doCheck dejagnu;
configureFlags = [ configureFlags = [
"--with-gcc-arch=generic" # no detection of -march= or -mtune= "--with-gcc-arch=generic" # no detection of -march= or -mtune=
"--enable-pax_emutramp" "--enable-pax_emutramp"
]; ];
inherit doCheck;
dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling. dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling.
# Install headers in the right place. # Install headers in the right place.

5
pkgs/top-level/all-packages.nix
View File

@ -6659,7 +6659,10 @@ let
}; };
glib = callPackage ../development/libraries/glib { }; 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 { }; glibmm = callPackage ../development/libraries/glibmm { };
glib_networking = callPackage ../development/libraries/glib-networking {}; glib_networking = callPackage ../development/libraries/glib-networking {};