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

Merge pull request #7119 from joachifm/gnu-smalltalk-emacs-support 

gnu-smalltalk: optional emacs support
This commit is contained in:
lethalman 2015-04-01 14:58:23 +02:00
parent f1e2b02cd3 c958486eea
commit e2bc785fe1
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/compilers/gnu-smalltalk/default.nix
View File

@ -1,5 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libtool, zip, libffi, libsigsegv, readline, gmp, { stdenv, fetchurl, pkgconfig, libtool, zip, libffi, libsigsegv, readline, gmp,
gnutls, gnome, cairo, SDL, sqlite }: gnutls, gnome, cairo, SDL, sqlite, emacsSupport ? false, emacs ? null }:
assert emacsSupport -> (emacs != null);
let # The gnu-smalltalk project has a dependency to the libsigsegv library. let # The gnu-smalltalk project has a dependency to the libsigsegv library.
# The project ships with sources for this library, but deprecated this option. # The project ships with sources for this library, but deprecated this option.
@ -26,9 +28,12 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
pkgconfig libtool zip libffi libsigsegv-shared readline gmp gnutls gnome.gtk pkgconfig libtool zip libffi libsigsegv-shared readline gmp gnutls gnome.gtk
cairo SDL sqlite cairo SDL sqlite
]; ]
++ stdenv.lib.optional emacsSupport emacs;
configureFlags = [ "--without-emacs" ]; configureFlags = stdenv.lib.optional (!emacsSupport) "--without-emacs";
installFlags = stdenv.lib.optional emacsSupport "lispdir=$(out)/share/emacs/site-lisp";
# For some reason the tests fail if executated with nix-build, but pass if # For some reason the tests fail if executated with nix-build, but pass if
# executed within nix-shell --pure. # executed within nix-shell --pure.

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

@ -3574,7 +3574,9 @@ let
inherit fetchurl stdenv; inherit fetchurl stdenv;
}); });
gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk {
emacsSupport = config.emacsSupport or false;
};
gccgo = gccgo48; gccgo = gccgo48;