From afd198f0f49c3b0172bb12133321f3fa38595199 Mon Sep 17 00:00:00 2001 From: Owen Lynch Date: Tue, 26 Dec 2017 22:32:23 -0500 Subject: [PATCH] mitschemeX11: init at 9.2 --- pkgs/development/compilers/mit-scheme/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 9 ++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 076f3c95675..4670f39eac1 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake }: +{ fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake, + enableX11 ? false, xlibsWrapper ? null }: let version = "9.2"; @@ -9,7 +10,7 @@ let else ""; in 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 # the platform-specific tarballs, which contain pre-built binaries. It @@ -29,6 +30,8 @@ stdenv.mkDerivation { sha256 = "0w5ib5vsidihb4hb6fma3sp596ykr8izagm57axvgd6lqzwicsjg"; }; + buildInputs = if enableX11 then [xlibsWrapper] else []; + configurePhase = '' (cd src && ./configure) (cd doc && ./configure) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc415f624c8..5eec315f470 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1220,7 +1220,7 @@ with pkgs; mpdris2 = callPackage ../tools/audio/mpdris2 { }; nfdump = callPackage ../tools/networking/nfdump { }; - + nrsc5 = callPackage ../applications/misc/nrsc5 { }; onboard = callPackage ../applications/misc/onboard { }; @@ -6277,6 +6277,13 @@ with pkgs; mitscheme = callPackage ../development/compilers/mit-scheme { texLive = texlive.combine { inherit (texlive) scheme-small; }; 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 {};