* Fix splashutils.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19662
This commit is contained in:
parent
bcba809460
commit
4430ce1952
@ -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;};
|
||||
|
||||
|
@ -4220,7 +4220,7 @@ let
|
||||
};
|
||||
|
||||
libjpegStatic = lowPrio (appendToName "static" (libjpeg.override {
|
||||
stdenv = disableSharedLibraries stdenv;
|
||||
stdenv = enableStaticLibraries stdenv;
|
||||
}));
|
||||
|
||||
libksba = import ../development/libraries/libksba {
|
||||
|
Loading…
Reference in New Issue
Block a user