Merge #10229: update and fix sbcl and cmucl

And related changes.

pkgs/development/interpreters/gtk-server/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, libffcall, gtk2, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  v = "2.3.1";
+  name = "gtk-server-${v}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/gtk-server/${name}-sr.tar.gz";
+    sha256 = "0z8ng5rhxc7fpsj3d50h25wkgcnxjfy030jm8r9w9m729w2c9hxb";
+  };
+
+  buildInputs = [ libffcall gtk2 pkgconfig ];
+
+  configureOptions = [ "--with-gtk2" ];
+
+  meta = {
+    description = "gtk-server for interpreted GUI programming";
+    homepage = "http://www.gtk-server.org/";
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}

pkgs/development/interpreters/picolisp/default.nix

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
     cat >"$out/bin/pil" <<EOF
     #! /bin/sh
-    $out/bin/picolisp $out/lib/picolisp/lib.l @lib/misc.l @lib/btree.l @lib/db.l @lib/pilog.l
+    exec $out/bin/picolisp $out/lib/picolisp/lib.l @lib/misc.l @lib/btree.l @lib/db.l @lib/pilog.l
     EOF
     chmod +x "$out/bin/pil"