Merge pull request #169857 from armeenm/bump-hopper

hopper: 4.5.29 -> 5.5.3; libffi_3_3: init
This commit is contained in:
Rick van Schijndel 2022-05-05 21:19:10 +02:00 committed by GitHub
commit cce50c11ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 83 additions and 16 deletions

View File

@ -972,6 +972,12 @@
githubId = 1118815;
name = "Vikram Narayanan";
};
armeenm = {
email = "mahdianarmeen@gmail.com";
github = "armeenm";
githubId = 29145250;
name = "Armeen Mahdian";
};
armijnhemel = {
email = "armijn@tjaldur.nl";
github = "armijnhemel";

View File

@ -0,0 +1,64 @@
{ lib, stdenv, fetchurl, fetchpatch
, autoreconfHook
, doCheck ? true # test suite depends on dejagnu which cannot be used during bootstrapping
, dejagnu
}:
stdenv.mkDerivation rec {
pname = "libffi";
version = "3.3";
src = fetchurl {
url = "https://github.com/libffi/libffi/releases/download/v${version}/${pname}-${version}.tar.gz";
hash = "sha256-cvunkicD3fp6Ao1ROsFahcjVTI1n9V+lpIAohdxlIFY=";
};
patches = [];
outputs = [ "out" "dev" "man" "info" ];
configureFlags = [
"--with-gcc-arch=generic" # no detection of -march= or -mtune=
"--enable-pax_emutramp"
# Causes issues in downstream packages which misuse ffi_closure_alloc
# Reenable once these issues are fixed and merged:
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6155
# https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/283
"--disable-exec-static-tramp"
];
preCheck = ''
# The tests use -O0 which is not compatible with -D_FORTIFY_SOURCE.
NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/}
'';
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; # Don't run the native `strip' when cross-compiling.
inherit doCheck;
checkInputs = [ dejagnu ];
meta = with lib; {
description = "A foreign function call interface library";
longDescription = ''
The libffi library provides a portable, high level programming
interface to various calling conventions. This allows a
programmer to call any function specified by a call interface
description at run-time.
FFI stands for Foreign Function Interface. A foreign function
interface is the popular name for the interface that allows code
written in one language to call code written in another
language. The libffi library really only provides the lowest,
machine dependent layer of a fully featured foreign function
interface. A layer must exist above libffi that handles type
conversions for values passed between the two languages.
'';
homepage = "http://sourceware.org/libffi/";
license = licenses.mit;
maintainers = with maintainers; [ armeenm ];
platforms = platforms.all;
};
}

View File

@ -3,36 +3,35 @@
, lib
, autoPatchelfHook
, wrapQtAppsHook
, libbsd
, python27
, gmpxx
, ncurses5
, gnustep
, libffi
, libbsd
, libffi_3_3
, ncurses6
}:
stdenv.mkDerivation rec {
pname = "hopper";
version = "4.5.29";
rev = "v${lib.versions.major version}";
version = "5.5.3";
rev = "v4";
src = fetchurl {
url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz";
sha256 = "1v1pff5fiv41khvrnlpdks2vddjnvziyn14qqj6v26snyhwi86zh";
url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux-demo.pkg.tar.xz";
hash = "sha256-xq9ZVg1leHm/tq6LYyQLa8p5dDwBd64Jt92uMoE0z58=";
};
sourceRoot = ".";
nativeBuildInputs = [
wrapQtAppsHook
autoPatchelfHook
wrapQtAppsHook
];
buildInputs = [
libbsd
python27
gmpxx
ncurses5
gnustep.libobjc
libbsd
libffi_3_3
ncurses6
];
installPhase = ''
@ -54,9 +53,6 @@ stdenv.mkDerivation rec {
$sourceRoot/opt/hopper-${rev}/lib/libpthread_workqueue.so* \
$out/lib
# we already ship libffi.so.7
ln -s ${lib.getLib libffi}/lib/libffi.so $out/lib/libffi.so.6
cp -r $sourceRoot/usr/share $out
runHook postInstall

View File

@ -18598,6 +18598,7 @@ with pkgs;
libffcall = callPackage ../development/libraries/libffcall { };
libffi = callPackage ../development/libraries/libffi { };
libffi_3_3 = callPackage ../development/libraries/libffi/3.3.nix { };
libffiBoot = libffi.override {
doCheck = false;
};