diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-01-26 10:56:21 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-01-26 10:56:21 +0000 |
| commit | 4430ce1952c42ab273ab93e43d3129463194a024 (patch) | |
| tree | 2f18eeab7d3f743e543e92842c68c6820aa2305c /pkgs/stdenv | |
| parent | bcba809460349a2af85f5eca92039859e96abf68 (diff) | |
| download | nixlib-4430ce1952c42ab273ab93e43d3129463194a024.tar nixlib-4430ce1952c42ab273ab93e43d3129463194a024.tar.gz nixlib-4430ce1952c42ab273ab93e43d3129463194a024.tar.bz2 nixlib-4430ce1952c42ab273ab93e43d3129463194a024.tar.lz nixlib-4430ce1952c42ab273ab93e43d3129463194a024.tar.xz nixlib-4430ce1952c42ab273ab93e43d3129463194a024.tar.zst nixlib-4430ce1952c42ab273ab93e43d3129463194a024.zip | |
* Fix splashutils.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19662
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index ac9e807801c6..33e1f8505d27 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -108,14 +108,13 @@ rec { } // {inherit fetchurl;}; - # Return a modified stdenv that disables building shared libraries. - # However, executables will still be dynamically linked. - disableSharedLibraries = stdenv: stdenv // + # Return a modified stdenv that enables building static libraries. + enableStaticLibraries = stdenv: stdenv // { mkDerivation = args: stdenv.mkDerivation (args // { dontDisableStatic = true; configureFlags = (if args ? configureFlags then args.configureFlags else "") - + " --disable-shared"; # brrr... + + " --enable-static"; }); } // {inherit fetchurl;}; |