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

Merge pull request #82945 from Mic92/libffi-musl

Browse Source 
libffi: fix musl tests
This commit is contained in:
Jörg Thalheim 2020-03-19 21:38:34 +00:00 committed by GitHub
commit 9cc135d7ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 7 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,9 +1,6 @@
{ stdenv, fetchurl, fetchpatch { stdenv, fetchurl, fetchpatch
, autoreconfHook , autoreconfHook
# libffi is used in darwin and linux with glibc stdenv
# we cannot run checks within it
, doCheck ? stdenv.hostPlatform.isMusl, dejagnu
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -28,10 +25,6 @@ stdenv.mkDerivation rec {
NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/} NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/}
''; '';
checkInputs = [ dejagnu ];
inherit doCheck;
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; # Don't run the native `strip' when cross-compiling. dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; # Don't run the native `strip' when cross-compiling.
meta = with stdenv.lib; { meta = with stdenv.lib; {