diff options
| author | goibhniu <cillian.deroiste@gmail.com> | 2015-10-24 17:39:38 +0200 |
|---|---|---|
| committer | goibhniu <cillian.deroiste@gmail.com> | 2015-10-24 17:39:38 +0200 |
| commit | f93b52b8ae9af54489c7ccc1b0d6ae274740bedf (patch) | |
| tree | e9457723f84a761fdc0ae6d2df5d059ec93c8dd6 /pkgs/development/compilers | |
| parent | d85ae6138eb3d246cbf82702c7cfaf7857d45835 (diff) | |
| parent | 393f0eecaeadf1a8893a3c9c88ea4304f4a309b8 (diff) | |
| download | nixlib-f93b52b8ae9af54489c7ccc1b0d6ae274740bedf.tar nixlib-f93b52b8ae9af54489c7ccc1b0d6ae274740bedf.tar.gz nixlib-f93b52b8ae9af54489c7ccc1b0d6ae274740bedf.tar.bz2 nixlib-f93b52b8ae9af54489c7ccc1b0d6ae274740bedf.tar.lz nixlib-f93b52b8ae9af54489c7ccc1b0d6ae274740bedf.tar.xz nixlib-f93b52b8ae9af54489c7ccc1b0d6ae274740bedf.tar.zst nixlib-f93b52b8ae9af54489c7ccc1b0d6ae274740bedf.zip | |
Merge pull request #10414 from tohl/master
sbcl and mkcl fixes
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/mkcl/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/compilers/sbcl/1.2.0.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/sbcl/1.2.5.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/sbcl/default.nix | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index 2a34a5dc50b1..6d17d5a8b25d 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, gmp }: +{ stdenv, fetchgit, makeWrapper, gmp, gcc }: stdenv.mkDerivation rec { v = "1.1.9"; @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0ja7vyp5rjidb2a1gah35jqzqn6zjkikz5sd966p0f0wh26l6n03"; }; + buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ gmp ]; configureFlags = [ @@ -17,6 +18,10 @@ stdenv.mkDerivation rec { "GMP_LDFLAGS=-L${gmp}/lib" ]; + postInstall = '' + wrapProgram $out/bin/mkcl --prefix PATH : "${gcc}/bin" + ''; + meta = { description = "ANSI Common Lisp Implementation"; homepage = https://common-lisp.net/project/mkcl/; diff --git a/pkgs/development/compilers/sbcl/1.2.0.nix b/pkgs/development/compilers/sbcl/1.2.0.nix index d19edce2c105..975cb7db1bbf 100644 --- a/pkgs/development/compilers/sbcl/1.2.0.nix +++ b/pkgs/development/compilers/sbcl/1.2.0.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { sh make.sh clisp --prefix=$out '' 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 = '' diff --git a/pkgs/development/compilers/sbcl/1.2.5.nix b/pkgs/development/compilers/sbcl/1.2.5.nix index 6c0fa874f3eb..68ed58b426f6 100644 --- a/pkgs/development/compilers/sbcl/1.2.5.nix +++ b/pkgs/development/compilers/sbcl/1.2.5.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { sh make.sh clisp --prefix=$out '' 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 = '' diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index a865b7e1d4be..e8aabbbcb8a4 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" + sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost} --disable-debugger --no-userinit --no-sysinit" ''; installPhase = '' |