public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openssl: Fix hurd-x86 cross-build

Browse Source 
Now the install phase fails.

svn path=/nixpkgs/trunk/; revision=30451
This commit is contained in:
Shea Levy 2011-11-16 18:33:12 +00:00
parent f9a103164d
commit 4231e7ba5e
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/openssl/default.nix
View File

@ -6,6 +6,12 @@ let
opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
(throw "openssl needs its platform name cross building" null) (throw "openssl needs its platform name cross building" null)
stdenv.cross; stdenv.cross;
# openssl only defines _GNU_SOURCE on Linux by default, but we need it on GNU
hurdGNUSourcePatch = fetchurl {
url = http://patch-tracker.debian.org/patch/series/dl/openssl/1.0.0e-2.1/gnu_source.patch;
sha256 = "0zp4x8bql92fbqywnigqfsfj2vvabb66wv6g6zgzh0y6js1ic4pn";
};
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -42,6 +48,8 @@ stdenv.mkDerivation {
export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}" export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}"
''; '';
patches = stdenv.lib.optional (opensslCrossSystem == "hurd-x86") hurdGNUSourcePatch;
postInstall = '' postInstall = ''
# Openssl installs readonly files, which otherwise we can't strip. # Openssl installs readonly files, which otherwise we can't strip.
# This could at some stdenv hash change be put out of crossAttrs, too # This could at some stdenv hash change be put out of crossAttrs, too