* Fix splashutils.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19662
This commit is contained in:
Eelco Dolstra 2010-01-26 10:56:21 +00:00
parent bcba809460
commit 4430ce1952
2 changed files with 4 additions and 5 deletions

View file

@ -108,14 +108,13 @@ rec {
} // {inherit fetchurl;}; } // {inherit fetchurl;};
# Return a modified stdenv that disables building shared libraries. # Return a modified stdenv that enables building static libraries.
# However, executables will still be dynamically linked. enableStaticLibraries = stdenv: stdenv //
disableSharedLibraries = stdenv: stdenv //
{ mkDerivation = args: stdenv.mkDerivation (args // { { mkDerivation = args: stdenv.mkDerivation (args // {
dontDisableStatic = true; dontDisableStatic = true;
configureFlags = configureFlags =
(if args ? configureFlags then args.configureFlags else "") (if args ? configureFlags then args.configureFlags else "")
+ " --disable-shared"; # brrr... + " --enable-static";
}); });
} // {inherit fetchurl;}; } // {inherit fetchurl;};

View file

@ -4220,7 +4220,7 @@ let
}; };
libjpegStatic = lowPrio (appendToName "static" (libjpeg.override { libjpegStatic = lowPrio (appendToName "static" (libjpeg.override {
stdenv = disableSharedLibraries stdenv; stdenv = enableStaticLibraries stdenv;
})); }));
libksba = import ../development/libraries/libksba { libksba = import ../development/libraries/libksba {