From 5da5a72830c7e4a18f19cea671e78afb84be315d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 Aug 2003 11:30:45 +0000 Subject: [PATCH] * OpenSSL's rpath should include itself. svn path=/nixpkgs/trunk/; revision=258 --- pkgs/openssl/openssl-build.sh | 5 +++++ pkgs/openssl/openssl.fix | 2 ++ 2 files changed, 7 insertions(+) diff --git a/pkgs/openssl/openssl-build.sh b/pkgs/openssl/openssl-build.sh index bbc8b7e14b3..1e6213ae648 100755 --- a/pkgs/openssl/openssl-build.sh +++ b/pkgs/openssl/openssl-build.sh @@ -4,9 +4,14 @@ export NIX_LDFLAGS=-Wl,-s . $stdenv/setup || exit 1 +envpkgs="" +. $setenv || exit 1 + tar xvfz $src || exit 1 cd openssl-* || exit 1 ./config --prefix=$out shared || exit 1 make || exit 1 mkdir $out || exit 1 make install || exit 1 + +echo $envpkgs > $out/envpkgs || exit 1 diff --git a/pkgs/openssl/openssl.fix b/pkgs/openssl/openssl.fix index fb02db0f738..533f6d7fb4b 100644 --- a/pkgs/openssl/openssl.fix +++ b/pkgs/openssl/openssl.fix @@ -1,6 +1,8 @@ Package( [ ("name", "openssl-0.9.7b") + , ("build", Relative("openssl/openssl-build.sh")) + , ("setenv", Relative("helpers/set-env.sh")) , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "http://www.openssl.org/source/openssl-0.9.7b.tar.gz")