diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-08-15 03:38:27 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-08-15 03:38:27 +0200 |
| commit | 7524e9fd3385e9b123d2e80a4cede284934461a9 (patch) | |
| tree | 4204d41bf76e527e3ec8a83d355b49fcc8cea7ea /pkgs | |
| parent | 9edd0ebdfa385487a3c7e9ec6bb3a16297061981 (diff) | |
| parent | c05fbdb06848718be97fe92b3ba7cca0c293f744 (diff) | |
| download | nixpkgs-7524e9fd3385e9b123d2e80a4cede284934461a9.tar nixpkgs-7524e9fd3385e9b123d2e80a4cede284934461a9.tar.gz nixpkgs-7524e9fd3385e9b123d2e80a4cede284934461a9.tar.bz2 nixpkgs-7524e9fd3385e9b123d2e80a4cede284934461a9.tar.lz nixpkgs-7524e9fd3385e9b123d2e80a4cede284934461a9.tar.xz nixpkgs-7524e9fd3385e9b123d2e80a4cede284934461a9.tar.zst nixpkgs-7524e9fd3385e9b123d2e80a4cede284934461a9.zip | |
Merge #133821: libffi: disable static trampolines
... into staging-next
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libffi/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 7909b7abc4f..4332f43c5af 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -24,6 +24,12 @@ stdenv.mkDerivation rec { 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 = '' |