diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-12-14 14:31:56 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-12-14 14:31:56 +0000 |
commit | cfde88976ba4cddd01b1bb28b40afd12ea93a11d (patch) | |
tree | 71b2dcebf820baafe7e54114f37e274e2a01da47 /pkgs/stdenv/adapters.nix | |
parent | 9eb4c4ddef57a82385de4ba7bf45e798d7ec6cbf (diff) |
* Streamline the stdenv bootstrap and resulting closure by removing
some redundant builds (e.g., GMP was built three times). * Updated GMP to 5.0.2. * Updated PPL to 0.11.2. * Remove ad hoc flags to build GCC's dependencies statically. Instead, use the ‘makeStaticLibraries’ stdenv adapter. * Build GMP with C++ support by default. svn path=/nixpkgs/branches/stdenv-updates/; revision=30891
Diffstat (limited to 'pkgs/stdenv/adapters.nix')
-rw-r--r-- | pkgs/stdenv/adapters.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index a1e8aafd7bc6d..11ee83b945668 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -109,13 +109,14 @@ rec { } // {inherit fetchurl;}; - # Return a modified stdenv that enables building static libraries. - enableStaticLibraries = stdenv: stdenv // + # Return a modified stdenv that builds static libraries instead of + # shared libraries. + makeStaticLibraries = stdenv: stdenv // { mkDerivation = args: stdenv.mkDerivation (args // { dontDisableStatic = true; configureFlags = - (if args ? configureFlags then args.configureFlags else "") - + " --enable-static"; + (if args ? configureFlags then toString args.configureFlags else "") + + " --enable-static --disable-shared"; }); } // {inherit fetchurl;}; |