nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 16:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #101422 from omasanori/ecl-20.4.24

Browse Source 
ecl: 16.1.3 -> 20.4.24, eql-git: fix build
This commit is contained in:
Michael Raskin 2020-10-23 06:12:13 +00:00 committed by GitHub
commit c05803df2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/compilers/ecl/default.nix
View File

@ -1,5 +1,6 @@
{stdenv, fetchurl
, libtool, autoconf, automake
, texinfo
, gmp, mpfr, libffi, makeWrapper
, noUnicode ? false
, gcc
@ -10,14 +11,13 @@ let
s = # Generated upstream information
rec {
baseName="ecl";
version="16.1.3";
version="20.4.24";
name="${baseName}-${version}";
hash="0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn";
url="https://common-lisp.net/project/ecl/static/files/release/ecl-16.1.3.tgz";
sha256="0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn";
url="https://common-lisp.net/project/ecl/static/files/release/${name}.tgz";
sha256="01qgdmr54wkj854f69qdm9sybrvd6gd21dpx4askdaaqybnkh237";
};
buildInputs = [
libtool autoconf automake makeWrapper
libtool autoconf automake texinfo makeWrapper
];
propagatedBuildInputs = [
libffi gmp mpfr gcc
@ -36,7 +36,6 @@ stdenv.mkDerivation {
};
patches = [
./libffi-3.3-abi.patch
];
configureFlags = [

15
pkgs/development/compilers/ecl/libffi-3.3-abi.patch
View File

@ -1,15 +0,0 @@
diff --git a/src/c/ffi.d b/src/c/ffi.d
index 8174977a..caa69f39 100644
--- a/src/c/ffi.d
+++ b/src/c/ffi.d
@@ -133,8 +133,8 @@ static struct {
#elif defined(X86_WIN64)
{@':win64', FFI_WIN64},
#elif defined(X86_ANY) || defined(X86) || defined(X86_64)
- {@':cdecl', FFI_SYSV},
- {@':sysv', FFI_SYSV},
+ {@':cdecl', FFI_UNIX64},
+ {@':sysv', FFI_UNIX64},
{@':unix64', FFI_UNIX64},
#endif
};

3
pkgs/development/compilers/eql/default.nix
View File

@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
postPatch = ''
sed -re 's@[(]in-home "gui/.command-history"[)]@(concatenate '"'"'string (ext:getenv "HOME") "/.eql-gui-command-history")@' -i gui/gui.lisp
# cl_def_c_function was renamed to ecl_def_c_function in ECL 20.4.24.
find . -type f -exec sed -e 's/\scl_def_c_function(/ ecl_def_c_function(/' -i {} \;
'';
buildPhase = ''