public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10414 from tohl/master 

sbcl and mkcl fixes
This commit is contained in:
goibhniu 2015-10-24 17:39:38 +02:00
parent d85ae6138e 393f0eecae
commit f93b52b8ae
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/compilers/mkcl/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, gmp }: { stdenv, fetchgit, makeWrapper, gmp, gcc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
v = "1.1.9"; v = "1.1.9";
@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0ja7vyp5rjidb2a1gah35jqzqn6zjkikz5sd966p0f0wh26l6n03"; sha256 = "0ja7vyp5rjidb2a1gah35jqzqn6zjkikz5sd966p0f0wh26l6n03";
}; };
buildInputs = [ makeWrapper ];
propagatedBuildInputs = [ gmp ]; propagatedBuildInputs = [ gmp ];
configureFlags = [ configureFlags = [
@ -17,6 +18,10 @@ stdenv.mkDerivation rec {
"GMP_LDFLAGS=-L${gmp}/lib" "GMP_LDFLAGS=-L${gmp}/lib"
]; ];
postInstall = ''
wrapProgram $out/bin/mkcl --prefix PATH : "${gcc}/bin"
'';
meta = { meta = {
description = "ANSI Common Lisp Implementation"; description = "ANSI Common Lisp Implementation";
homepage = https://common-lisp.net/project/mkcl/; homepage = https://common-lisp.net/project/mkcl/;

2
pkgs/development/compilers/sbcl/1.2.0.nix
View File

@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
sh make.sh clisp --prefix=$out sh make.sh clisp --prefix=$out
'' ''
else '' else ''
sh make.sh --prefix=$out --xc-host='${sbclBootstrap}/bin/sbcl --core ${sbclBootstrap}/share/sbcl/sbcl.core --disable-debugger --no-userinit --no-sysinit' sh make.sh --prefix=$out --xc-host='${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit'
''; '';
installPhase = '' installPhase = ''

2
pkgs/development/compilers/sbcl/1.2.5.nix
View File

@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
sh make.sh clisp --prefix=$out sh make.sh clisp --prefix=$out
'' ''
else '' else ''
sh make.sh --prefix=$out --xc-host='${sbclBootstrap}/bin/sbcl --core ${sbclBootstrap}/share/sbcl/sbcl.core --disable-debugger --no-userinit --no-sysinit' sh make.sh --prefix=$out --xc-host='${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit'
''; '';
installPhase = '' installPhase = ''

2
pkgs/development/compilers/sbcl/default.nix
View File

@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
''; '';
buildPhase = '' buildPhase = ''
sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost} --disable-debugger --no-userinit --no-sysinit"
''; '';
installPhase = '' installPhase = ''