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

libffi: simplify using checkInputs

Browse Source
This commit is contained in:
Jan Malakhovski 2018-03-30 00:01:00 +00:00
parent dca7b10fd5
commit 2badf9a6f8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
{ stdenv, fetchurl, fetchpatch, dejagnu, doCheck ? false { stdenv, fetchurl, fetchpatch
, buildPlatform, hostPlatform, autoreconfHook , buildPlatform, hostPlatform, autoreconfHook
, doCheck ? true, dejagnu
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -40,8 +41,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" "info" ]; outputs = [ "out" "dev" "man" "info" ];
buildInputs = stdenv.lib.optional doCheck dejagnu;
nativeBuildInputs = stdenv.lib.optional hostPlatform.isRiscV autoreconfHook; nativeBuildInputs = stdenv.lib.optional hostPlatform.isRiscV autoreconfHook;
configureFlags = [ configureFlags = [
@ -54,6 +53,8 @@ stdenv.mkDerivation rec {
NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/} NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/}
''; '';
checkInputs = [ dejagnu ];
inherit doCheck; inherit doCheck;
dontStrip = hostPlatform != buildPlatform; # Don't run the native `strip' when cross-compiling. dontStrip = hostPlatform != buildPlatform; # Don't run the native `strip' when cross-compiling.