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

Merge pull request #33100 from olynch/mitschemeX11

Browse Source 
mitschemeX11: init at 9.2
This commit is contained in:
Yegor Timoshenko 2017-12-30 04:33:53 +03:00 committed by GitHub
commit 41ab3d4bd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/compilers/mit-scheme/default.nix
View File

@ -1,4 +1,5 @@
{ fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake }: { fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake,
enableX11 ? false, xlibsWrapper ? null }:
let let
version = "9.2"; version = "9.2";
@ -9,7 +10,7 @@ let
else ""; else "";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mit-scheme-${version}"; name = if enableX11 then "mit-scheme-x11-${version}" else "mit-scheme-${version}";
# MIT/GNU Scheme is not bootstrappable, so it's recommended to compile from # MIT/GNU Scheme is not bootstrappable, so it's recommended to compile from
# the platform-specific tarballs, which contain pre-built binaries. It # the platform-specific tarballs, which contain pre-built binaries. It
@ -29,6 +30,8 @@ stdenv.mkDerivation {
sha256 = "0w5ib5vsidihb4hb6fma3sp596ykr8izagm57axvgd6lqzwicsjg"; sha256 = "0w5ib5vsidihb4hb6fma3sp596ykr8izagm57axvgd6lqzwicsjg";
}; };
buildInputs = if enableX11 then [xlibsWrapper] else [];
configurePhase = configurePhase =
'' (cd src && ./configure) '' (cd src && ./configure)
(cd doc && ./configure) (cd doc && ./configure)

7
pkgs/top-level/all-packages.nix
View File

@ -6279,6 +6279,13 @@ with pkgs;
mitscheme = callPackage ../development/compilers/mit-scheme { mitscheme = callPackage ../development/compilers/mit-scheme {
texLive = texlive.combine { inherit (texlive) scheme-small; }; texLive = texlive.combine { inherit (texlive) scheme-small; };
texinfo = texinfo5; texinfo = texinfo5;
xlibsWrapper = null;
};
mitschemeX11 = callPackage ../development/compilers/mit-scheme {
texLive = texlive.combine { inherit (texlive) scheme-small; };
texinfo = texinfo5;
enableX11 = true;
}; };
mkcl = callPackage ../development/compilers/mkcl {}; mkcl = callPackage ../development/compilers/mkcl {};