From 4430ce1952c42ab273ab93e43d3129463194a024 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jan 2010 10:56:21 +0000
Subject: [PATCH] * Fix splashutils.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19662
---
 pkgs/stdenv/adapters.nix        | 7 +++----
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 4 insertions(+), 5 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;};
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 100e07f01528..82f269fd00bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4220,7 +4220,7 @@ let
   };
 
   libjpegStatic = lowPrio (appendToName "static" (libjpeg.override {
-    stdenv = disableSharedLibraries stdenv;
+    stdenv = enableStaticLibraries stdenv;
   }));
 
   libksba = import ../development/libraries/libksba {