Author: viric
Date: Fri Jan 6 21:31:29 2012
New Revision: 31379
URL: https://nixos.org/websvn/nix/?rev=31379&sc=1
Log:
I found that instantiating xbursttools brought to the openssl evaluation
throwing an exception about an undefined platform.openssl.system.
That was introduced by r31330, which made openssl for the build system to
evaluate the platform.openssl.system, that should only be needed for the host
system.
I also revert supplying openssl.system for xbursttools.
Modified:
nixpkgs/trunk/pkgs/development/libraries/openssl/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/openssl/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/openssl/default.nix Fri Jan
6 21:10:19 2012 (r31378)
+++ nixpkgs/trunk/pkgs/development/libraries/openssl/default.nix Fri Jan
6 21:31:29 2012 (r31379)
@@ -6,17 +6,8 @@
opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
(throw "openssl needs its platform name cross building" null)
stdenv.cross;
-in
-
-stdenv.mkDerivation {
- inherit name;
-
- src = fetchurl {
- url = "http://www.openssl.org/source/${name}.tar.gz";;
- sha256 = "1xw0ffzmr4wbnb0glywgks375dvq8x87pgxmwx6vhgvkflkxqqg3";
- };
- patches =
+ patchesCross = isCross:
[ # Allow the location of the X509 certificate file (the CA
# bundle) to be set through the environment variable
# ‘OPENSSL_X509_CERT_FILE’. This is necessary because the
@@ -27,12 +18,24 @@
./cert-file.patch
]
- ++ (stdenv.lib.optionals (stdenv ? cross && opensslCrossSystem ==
"hurd-x86")
+ ++ (stdenv.lib.optionals (isCross && opensslCrossSystem == "hurd-x86")
[ ./cert-file-path-max.patch # merge with `cert-file.patch' eventually
./gnu.patch # submitted upstream
])
++ (stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch);
+
+in
+
+stdenv.mkDerivation {
+ inherit name;
+
+ src = fetchurl {
+ url = "http://www.openssl.org/source/${name}.tar.gz";;
+ sha256 = "1xw0ffzmr4wbnb0glywgks375dvq8x87pgxmwx6vhgvkflkxqqg3";
+ };
+
+ patches = patchesCross false;
buildNativeInputs = [ perl ];
@@ -55,6 +58,8 @@
''; # */
crossAttrs = {
+ patches = patchesCross true;
+
preConfigure=''
# It's configure does not like --build or --host
export configureFlags="--libdir=lib
--cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}"
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jan 6 21:10:19
2012 (r31378)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jan 6 21:31:29
2012 (r31379)
@@ -1586,7 +1586,6 @@
gcc = {
arch = "mips32";
};
- openssl.system = "linux-generic32";
};
};
in
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
