diff options
| author | Marko Durkovic <marko@miding.de> | 2014-10-23 19:15:56 +0200 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2015-05-28 10:53:36 +0200 |
| commit | 2904aa33bb4fd1b9444205d07842d6f1f29ab927 (patch) | |
| tree | 589766594fdf940cc25a053c22ba5580f70da8b3 /pkgs/development/libraries/libffi | |
| parent | 15952587a0b84aaf1544a37d97f34fc782ee3c6d (diff) | |
| download | nixpkgs-2904aa33bb4fd1b9444205d07842d6f1f29ab927.tar nixpkgs-2904aa33bb4fd1b9444205d07842d6f1f29ab927.tar.gz nixpkgs-2904aa33bb4fd1b9444205d07842d6f1f29ab927.tar.bz2 nixpkgs-2904aa33bb4fd1b9444205d07842d6f1f29ab927.tar.lz nixpkgs-2904aa33bb4fd1b9444205d07842d6f1f29ab927.tar.xz nixpkgs-2904aa33bb4fd1b9444205d07842d6f1f29ab927.tar.zst nixpkgs-2904aa33bb4fd1b9444205d07842d6f1f29ab927.zip | |
cygwin: libffi
Diffstat (limited to 'pkgs/development/libraries/libffi')
| -rw-r--r-- | pkgs/development/libraries/libffi/3.2.1-cygwin.patch | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/libffi/default.nix | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libffi/3.2.1-cygwin.patch b/pkgs/development/libraries/libffi/3.2.1-cygwin.patch new file mode 100644 index 00000000000..f3b38dbd1c1 --- /dev/null +++ b/pkgs/development/libraries/libffi/3.2.1-cygwin.patch @@ -0,0 +1,10 @@ +--- libffi-3.2.1/src/closures.c 2014-11-08 13:47:24.000000000 +0100 ++++ libffi-3.2.1/src/closures.c 2015-05-19 10:15:50.059325900 +0200 +@@ -212,6 +212,7 @@ + #include <sys/mman.h> + + /* Cygwin is Linux-like, but not quite that Linux-like. */ ++#define is_emutramp_enabled() 0 + #define is_selinux_enabled() 0 + + #endif /* !defined(X86_WIN32) && !defined(X86_WIN64) */ diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index bc15e88ba2f..668ac138be8 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh"; }; + patches = if stdenv.isCygwin then [ ./3.2.1-cygwin.patch ] else null; + buildInputs = stdenv.lib.optional doCheck dejagnu; configureFlags = [ |