diff options
Diffstat (limited to 'pkgs/development/libraries/libffi/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libffi/default.nix | 48 |
1 files changed, 5 insertions, 43 deletions
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 2918276ef21..cc080e7c638 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -7,45 +7,17 @@ }: stdenv.mkDerivation rec { - name = "libffi-3.2.1"; + name = "libffi-3.3"; src = fetchurl { url = "https://sourceware.org/pub/libffi/${name}.tar.gz"; - sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh"; + sha256 = "0mi0cpf8aa40ljjmzxb7im6dbj45bb0kllcd09xgmp834y9agyvj"; }; - patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch - ++ stdenv.lib.optional stdenv.isAarch64 (fetchpatch { - url = https://src.fedoraproject.org/rpms/libffi/raw/ccffc1700abfadb0969495a6e51b964117fc03f6/f/libffi-aarch64-rhbz1174037.patch; - sha256 = "1vpirrgny43hp0885rswgv3xski8hg7791vskpbg3wdjdpb20wbc"; - }) - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { - name = "gnu-linux-define.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/libffi/gnu-linux-define.patch?id=bb024fd8ec6f27a76d88396c9f7c5c4b5800d580"; - sha256 = "11pvy3xkhyvnjfyy293v51f1xjy3x0azrahv1nw9y9mw8bifa2j2"; - }) - ++ stdenv.lib.optional stdenv.hostPlatform.isRiscV (fetchpatch { - name = "riscv-support.patch"; - url = https://github.com/sorear/libffi-riscv/commit/e46492e8bb1695a19bc1053ed869e6c2bab02ff2.patch; - sha256 = "1vl1vbvdkigs617kckxvj8j4m2cwg62kxm1clav1w5rnw9afxg0y"; - }) - ++ stdenv.lib.optionals stdenv.isMips [ - (fetchpatch { - name = "0001-mips-Use-compiler-internal-define-for-linux.patch"; - url = "http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch?id=318e33a708378652edcf61ce7d9d7f3a07743000"; - sha256 = "1gc53lw90p6hc0cmhj3csrwincfz7va5ss995ksw5gm0yrr9mrvb"; - }) - (fetchpatch { - name = "0001-mips-fix-MIPS-softfloat-build-issue.patch"; - url = "http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-support/libffi/libffi/0001-mips-fix-MIPS-softfloat-build-issue.patch?id=318e33a708378652edcf61ce7d9d7f3a07743000"; - sha256 = "0l8xgdciqalg4z9rcwyk87h8fdxpfv4hfqxwsy2agpnpszl5jjdq"; - }) - ]; + patches = []; outputs = [ "out" "dev" "man" "info" ]; - nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isRiscV autoreconfHook; - configureFlags = [ "--with-gcc-arch=generic" # no detection of -march= or -mtune= "--enable-pax_emutramp" @@ -62,15 +34,6 @@ stdenv.mkDerivation rec { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; # Don't run the native `strip' when cross-compiling. - # Install headers and libs in the right places. - postFixup = '' - mkdir -p "$dev/" - mv "$out/lib/${name}/include" "$dev/include" - rmdir "$out/lib/${name}" - substituteInPlace "$dev/lib/pkgconfig/libffi.pc" \ - --replace 'includedir=''${libdir}/libffi-3.2.1' "includedir=$dev" - ''; - meta = with stdenv.lib; { description = "A foreign function call interface library"; longDescription = '' @@ -88,9 +51,8 @@ stdenv.mkDerivation rec { conversions for values passed between the two languages. ''; homepage = http://sourceware.org/libffi/; - # See https://github.com/atgreen/libffi/blob/master/LICENSE . - license = licenses.free; - maintainers = [ ]; + license = licenses.mit; + maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.all; }; } |