Author: raskin Date: 2010-07-06 16:48:03 +0000 (Tue, 06 Jul 2010) New Revision: 22498
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22498&view=rev Modified: nixpkgs/trunk/pkgs/development/compilers/gcl/default.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix Log: Apparently fixed GCL build Changes: Modified: nixpkgs/trunk/pkgs/development/compilers/gcl/default.nix =================================================================== --- nixpkgs/trunk/pkgs/development/compilers/gcl/default.nix 2010-07-06 14:54:22 UTC (rev 22497) +++ nixpkgs/trunk/pkgs/development/compilers/gcl/default.nix 2010-07-06 16:48:03 UTC (rev 22498) @@ -1,18 +1,19 @@ a : let buildInputs = with a; [ - mpfr m4 binutils emacs + mpfr m4 binutils emacs gmp libX11 xproto inputproto libXi libXext xextproto libXt libXaw libXmu + zlib which ]; in rec { src = a.fetchcvs { cvsRoot = ":pserver:[email protected]:/sources/gcl"; module = "gcl"; - tag = "Version_2_6_8pre"; - date = "2009-11-05"; - sha256 = "5aa6c1616f585466a6aae91e38472f20539be4ce978fd458592e425904bdd9bc"; + # tag = "Version_2_6_8pre"; + date = "2010-07-01"; + sha256 = "a61d1bf669fd11d13050e8e1ab850a5eecb38126b47c744c3e21646773c4fb4d"; }; name = "gcl-2.6.8pre"; @@ -20,11 +21,16 @@ configureFlags = []; preBuild = a.fullDepEntry ('' - echo '(defun init_gcl_cmpmap (&rest args))' >> cmpnew/cmpmap.lsp + sed -re "s@/bin/c...@$(which cat)@g" -i configure */configure + sed -re "s...@if test -d /proc/self @if false @" -i configure + sed -re 's^([ \t])cpp ^\1cpp -I${a.stdenv.gcc.gcc}/include -I${a.stdenv.gcc.libc}/include ^g' -i makefile '') ["minInit" "doUnpack"]; + fixConfigure = a.doPatchShebangs "."; + /* doConfigure should be removed if not needed */ - phaseNames = ["preBuild" "doConfigure" "doMakeInstall"]; + phaseNames = ["doUnpack" "fixConfigure" "preBuild" + "doConfigure" "doMakeInstall"]; meta = { description = "GNU Common Lisp compiler working via GCC"; Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-07-06 14:54:22 UTC (rev 22497) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-07-06 16:48:03 UTC (rev 22498) @@ -2336,16 +2336,13 @@ enableMultilib = false; })); - /* - Broken; fails because of unability to find its own symbols during linking - gcl = builderDefsPackage ../development/compilers/gcl { - inherit mpfr m4 binutils fetchcvs emacs; + inherit mpfr m4 binutils fetchcvs emacs zlib which + gmp; inherit (xlibs) libX11 xproto inputproto libXi libXext xextproto libXt libXaw libXmu; - stdenv = (overrideGCC stdenv gcc34) // {gcc = gcc33;}; + inherit stdenv; }; - */ # GHC _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
