diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2017-04-06 18:43:42 +0200 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2017-04-06 18:47:36 +0200 |
commit | 365e8a7b6a39a442bf07796a0541b76331e2ede4 (patch) | |
tree | 43470ece0a115017d92ef71b1dc5546016214d35 /pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix | |
parent | 09b1414acd7af2775414cbddd183db7b25697841 (diff) | |
download | nixpkgs-365e8a7b6a39a442bf07796a0541b76331e2ede4.tar nixpkgs-365e8a7b6a39a442bf07796a0541b76331e2ede4.tar.gz nixpkgs-365e8a7b6a39a442bf07796a0541b76331e2ede4.tar.bz2 nixpkgs-365e8a7b6a39a442bf07796a0541b76331e2ede4.tar.lz nixpkgs-365e8a7b6a39a442bf07796a0541b76331e2ede4.tar.xz nixpkgs-365e8a7b6a39a442bf07796a0541b76331e2ede4.tar.zst nixpkgs-365e8a7b6a39a442bf07796a0541b76331e2ede4.zip |
quicklispPackages: update to fresh QuickLisp
lispPackages: reduce environment-bombing
Diffstat (limited to 'pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix')
-rw-r--r-- | pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 01f734538b5..6228f9c5fec 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -10,15 +10,25 @@ let ((builtins.head l) x) // (multiOverride (builtins.tail l) x); in { - stumpwm = addDeps (with qlnp; [alexandria cl-ppcre clx]); + stumpwm = x:{ + overrides = y: (x.overrides y) // { + preConfigure = '' + export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh"; + ''; + }; + }; iterate = skipBuildPhase; cl-fuse = x: { propagatedBuildInputs = [pkgs.fuse]; overrides = y : (x.overrides y) // { configurePhase = '' + export SAVED_CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY" export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD" export makeFlags="$makeFlags LISP=common-lisp.sh" ''; + preInstall = '' + export CL_SOURCE_REGISTRY="$SAVED_CL_SOURCE_REGISTRY" + ''; }; }; hunchentoot = addNativeLibs [pkgs.openssl]; @@ -31,13 +41,10 @@ in flexi-streams circular-streams ironclad cl-syntax-annot alexandria split-sequence ]); - clack-handler-fcgi = addDeps (with qlnp; []); lack = addDeps (with qlnp; [ironclad]); - cxml = skipBuildPhase; - cxml-xml = skipBuildPhase; - cxml-dom = skipBuildPhase; - cxml-klacks = skipBuildPhase; - cxml-test = skipBuildPhase; + cxml = multiOverride [ skipBuildPhase (addDeps (with qlnp; [ + closure-common puri trivial-gray-streams + ]))]; wookie = multiOverride [(addDeps (with qlnp; [ alexandria blackbird cl-async chunga fast-http quri babel cl-ppcre cl-fad fast-io vom do-urlencode cl-async-ssl @@ -92,18 +99,10 @@ in ''; }; }; - cffi-grovel = addDeps (with qlnp; [ cffi-toolchain ]); - cffi-toolchain = addDeps (with qlnp; [ cffi uiop ]); - cffi-examples = addDeps (with qlnp; [ cffi ]); - cffi-libffi = addDeps (with qlnp; [ cffi ]); - cffi-uffi-compat = addDeps (with qlnp; [ cffi ]); cffi = multiOverride [(addNativeLibs [pkgs.libffi]) - (addDeps (with qlnp; [uffi]))]; + (addDeps (with qlnp; [uffi uiop trivial-features]))]; cl-vectors = addDeps (with qlnp; [zpb-ttf]); "3bmd" = addDeps (with qlnp; [esrap split-sequence]); - "3bmd-ext-tables" = addDeps (with qlnp; [qlnp."3bmd"]); - "3bmd-ext-wiki-links" = addDeps (with qlnp; [qlnp."3bmd"]); - "3bmd-youtube" = addDeps (with qlnp; [qlnp."3bmd"]); cl-dbi = addDeps (with qlnp; [ cl-syntax cl-syntax-annot split-sequence closer-mop bordeaux-threads ]); @@ -126,4 +125,11 @@ in babel-streams = addDeps (with qlnp; [babel]); plump = addDeps (with qlnp; [array-utils trivial-indent]); sqlite = addNativeLibs [pkgs.sqlite]; + uiop = x: { + overrides = y: (x.overrides y) // { + postInstall = ((x.overrides y).postInstall or "") + '' + cp -r "${pkgs.asdf}/lib/common-lisp/asdf/uiop/contrib" "$out/lib/common-lisp/uiop" + ''; + }; + }; } |