From 2c9fa335218e34a12fdb92d58f58975fd83e5b60 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Jun 2013 14:28:49 +0200
Subject: [PATCH] openssl: Split header files from the libraries

---
 pkgs/development/libraries/openssl/default.nix | 8 ++++++--
 pkgs/top-level/all-packages.nix                | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 148856cc7d7..8ba7e41425b 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -46,8 +46,9 @@ stdenv.mkDerivation {
 
   patches = patchesCross false;
 
-  # TODO: separate lib.
-  outputs = [ "out" "man" "bin" ];
+  outputs = [ "dev" "out" "man" "bin" ];
+
+  setOutputConfigureFlags = false;
 
   buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
 
@@ -78,6 +79,9 @@ stdenv.mkDerivation {
       mv $out/bin $bin/
 
       rm -rf $out/etc/ssl/misc
+
+      mkdir $dev
+      mv $out/include $dev/
     ''; # */
 
   crossAttrs = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b3d47a9ed5..b1993376fc4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4941,6 +4941,7 @@ let
   openscenegraph = callPackage ../development/libraries/openscenegraph {};
 
   openssl = callPackage ../development/libraries/openssl {
+    stdenv = stdenvMulti;
     fetchurl = fetchurlBoot;
     cryptodevHeaders = linuxPackages.cryptodev.override {
       fetchurl = fetchurlBoot;