diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-12-31 09:47:26 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-12-31 09:53:02 +0100 |
| commit | f9f6f41bff2213e199bded515e9b66d1e5c4d7dd (patch) | |
| tree | 29c5a75228e31f305f42c5b761709a186e406776 /pkgs/development/libraries/libffi | |
| parent | bbcf127c7c9029cba43493d7d25a9d1c65d59152 (diff) | |
| parent | 468f698f609e123bb0ffae67181d07ac99eb2204 (diff) | |
| download | nixpkgs-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar nixpkgs-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.gz nixpkgs-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.bz2 nixpkgs-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.lz nixpkgs-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.xz nixpkgs-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.zst nixpkgs-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.zip | |
Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5 on master, and I'm deferring pointing to correct outputs to later.
Diffstat (limited to 'pkgs/development/libraries/libffi')
| -rw-r--r-- | pkgs/development/libraries/libffi/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 816b9728cc9..962f716c120 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"; @@ -12,11 +12,15 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" "doc" ]; + 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 and libs in the right places. |