From 58a9b09f7c89e9d964e294b98b9dd481d87012d9 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Wed, 14 Oct 2015 23:39:12 +0200 Subject: [PATCH 1/3] mkcl: runtime needs gcc --- pkgs/development/compilers/mkcl/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index 2a34a5dc50b..6d17d5a8b25 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/; From eb1784d0e7e50770457052726a5f6e84b2e5fca7 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Fri, 16 Oct 2015 00:25:24 +0200 Subject: [PATCH 2/3] sbcl: remove duplicate --core argument --- pkgs/development/compilers/sbcl/1.2.0.nix | 2 +- pkgs/development/compilers/sbcl/1.2.5.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sbcl/1.2.0.nix b/pkgs/development/compilers/sbcl/1.2.0.nix index d19edce2c10..975cb7db1bb 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 6c0fa874f3e..68ed58b426f 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 = '' From 393f0eecaeadf1a8893a3c9c88ea4304f4a309b8 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Fri, 16 Oct 2015 00:26:45 +0200 Subject: [PATCH 3/3] sbcl: cleaner xc-host --- pkgs/development/compilers/sbcl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index a865b7e1d4b..e8aabbbcb8a 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 = ''