From d709ef5d30dfddb06bfa475ba82256b3692dd3de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Sep 2011 18:48:04 +0000 Subject: [PATCH] openssl: avoid the need for a recursive expression svn path=/nixpkgs/trunk/; revision=29426 --- pkgs/development/libraries/openssl/1.0.0e.nix | 6 ++++-- pkgs/development/libraries/openssl/default.nix | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/openssl/1.0.0e.nix b/pkgs/development/libraries/openssl/1.0.0e.nix index 73cdd1c3162a..01f9eca15bb9 100644 --- a/pkgs/development/libraries/openssl/1.0.0e.nix +++ b/pkgs/development/libraries/openssl/1.0.0e.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, perl }: let + name = "openssl-1.0.0e"; + opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) stdenv.cross; in -stdenv.mkDerivation rec { - name = "openssl-1.0.0e"; +stdenv.mkDerivation { + inherit name; src = fetchurl { url = "http://www.openssl.org/source/${name}.tar.gz"; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 52336ba3d50a..e51b88f5bca8 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, perl }: let + name = "openssl-1.0.0d"; + opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) stdenv.cross; in -stdenv.mkDerivation rec { - name = "openssl-1.0.0d"; +stdenv.mkDerivation { + inherit name; src = fetchurl { url = "http://www.openssl.org/source/${name}.tar.gz";