ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

* Fix splashutils.

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/stdenv/adapters.nix
View File

@ -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;};

2
pkgs/top-level/all-packages.nix
View File

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