From 6b8de64183f5ae7155258483c422661d892a3c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 28 Apr 2010 15:01:02 +0000 Subject: [PATCH] Revert "Install libraries to $out/lib instead of $out/lib64" This reverts commit 50429b2b63a3ad540e8fcd96be0cdaac46a27da2. svn path=/nixpkgs/trunk/; revision=21407 --- pkgs/development/libraries/openssl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index a3448e2641d..5c7fd37eb8e 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (rec { configureScript = "./config"; - configureFlags="--libdir=lib shared"; + configureFlags = "shared"; crossAttrs = { - preConfigure='' + configurePhase = '' export cross=$crossSystem- + ./Configure --prefix=$out ${opensslCrossSystem} shared ''; - configureFlags="--libdir=lib ${opensslCrossSystem} shared"; buildPhase = '' make CC=$crossConfig-gcc \ AR="$crossConfig-ar r" \