diff options
author | Vladimír Čunát <v@cunat.cz> | 2023-11-16 22:06:22 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2023-11-16 22:06:22 +0100 |
commit | a7a8f8253db3f32cc15baf527d36ef7171425eba (patch) | |
tree | 5de25f1c82e7892f6aec7b3e5ddb718ff0c50df2 /pkgs/development/libraries/libffi/default.nix | |
parent | f31242fcfd14e870eb6898fc8849bc4dee883054 (diff) | |
parent | 391aafc3d6b17ed5517795eb8b9c41ed7c6082e3 (diff) |
Merge #263535: staging-next 2023-10-26
Diffstat (limited to 'pkgs/development/libraries/libffi/default.nix')
-rw-r--r-- | pkgs/development/libraries/libffi/default.nix | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 681f9cbfb2297..5bfa335314fe8 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -34,12 +34,6 @@ 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 = '' |