summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/development/libraries/openssl-0.9.8/builder.sh12
-rw-r--r--pkgs/development/libraries/openssl-0.9.8/default.nix13
-rw-r--r--pkgs/development/libraries/openssl-0.9.8/dylib.patch (renamed from pkgs/development/libraries/openssl/dylib.patch)0
-rw-r--r--pkgs/development/libraries/openssl/default.nix10
4 files changed, 28 insertions, 7 deletions
diff --git a/pkgs/development/libraries/openssl-0.9.8/builder.sh b/pkgs/development/libraries/openssl-0.9.8/builder.sh
new file mode 100644
index 000000000000..0ad465c87715
--- /dev/null
+++ b/pkgs/development/libraries/openssl-0.9.8/builder.sh
@@ -0,0 +1,12 @@
+. $stdenv/setup
+
+configureScript=./config
+configureFlags=shared
+
+postInstall=postInstall
+postInstall() {
+    # Bug fix: openssl does a `chmod 644' on the pkgconfig directory.
+    chmod 755 $out/lib/pkgconfig || exit 1
+}
+
+genericBuild
diff --git a/pkgs/development/libraries/openssl-0.9.8/default.nix b/pkgs/development/libraries/openssl-0.9.8/default.nix
new file mode 100644
index 000000000000..44778a98128d
--- /dev/null
+++ b/pkgs/development/libraries/openssl-0.9.8/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, perl}: stdenv.mkDerivation {
+  name = "openssl-0.9.8";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.openssl.org/source/openssl-0.9.8.tar.gz;
+    md5 = "9da21071596a124acde6080552deac16";
+  };
+  buildInputs = [perl];
+
+  # Quick fix for a Makefile bug in openssl-0.9.8 (`make install'
+  # tries to copy .so files, instead of .dylib files).
+  patches = if stdenv.system == "powerpc-darwin" then [./dylib.patch] else [];
+}
diff --git a/pkgs/development/libraries/openssl/dylib.patch b/pkgs/development/libraries/openssl-0.9.8/dylib.patch
index ee3e31d4571b..ee3e31d4571b 100644
--- a/pkgs/development/libraries/openssl/dylib.patch
+++ b/pkgs/development/libraries/openssl-0.9.8/dylib.patch
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 44778a98128d..4740fefeb7ab 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,13 +1,9 @@
 {stdenv, fetchurl, perl}: stdenv.mkDerivation {
-  name = "openssl-0.9.8";
+  name = "openssl-0.9.7g";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.openssl.org/source/openssl-0.9.8.tar.gz;
-    md5 = "9da21071596a124acde6080552deac16";
+    url = http://www.openssl.org/source/openssl-0.9.7g.tar.gz;
+    md5 = "991615f73338a571b6a1be7d74906934";
   };
   buildInputs = [perl];
-
-  # Quick fix for a Makefile bug in openssl-0.9.8 (`make install'
-  # tries to copy .so files, instead of .dylib files).
-  patches = if stdenv.system == "powerpc-darwin" then [./dylib.patch] else [];
 }