summary refs log tree commit diff
path: root/pkgs/development/compilers/gcl
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-03-28 15:16:29 +0000
committerRobin Gloster <mail@glob.in>2016-03-28 15:16:29 +0000
commitf60c9df0ba66767dfa64bf2fb95eb6776cafa2c3 (patch)
tree0f17999d3a5444f16f09e0c1d7f3075e0224e731 /pkgs/development/compilers/gcl
parent3f45f0948d6fe158bed063adb66850ded0ba4861 (diff)
parentc61445357e2a92470bee43a71a10baef1a3196e4 (diff)
downloadnixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar
nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.gz
nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.bz2
nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.lz
nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.xz
nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.zst
nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.zip
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/compilers/gcl')
-rw-r--r--pkgs/development/compilers/gcl/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index e57abec2c1ba..cf25f989c7c4 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
     url = "http://gnu.spinellicreations.com/gcl/${name}.tar.gz";
   };
 
+  patches = [(fetchurl {
+    url = https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch;
+    sha256 = "00jbsn0qp8ki2w7dx8caha7g2hr9076xa6bg48j3qqqncff93zdh";
+  })];
+
   buildInputs = [
     mpfr m4 binutils emacs gmp
     libX11 xproto inputproto libXi
@@ -29,6 +34,8 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "pic" ];
 
+  NIX_CFLAGS_COMPILE = "-fgnu89-inline";
+
   meta = {
     description = "GNU Common Lisp compiler working via GCC";
     maintainers = [ stdenv.lib.maintainers.raskin ];