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

Making fossil cross-build (it works for the nanonote). 

Removing some perl scripts from the openssl cross-built derivation, to avoid depending on it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23128
This commit is contained in:
Lluís Batlle i Rossell 2010-08-11 20:08:29 +00:00
parent e97ad11560
commit 3f05ed581f
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/fossil/default.nix
View File

@ -19,6 +19,10 @@ stdenv.mkDerivation {
INSTALLDIR=$out/bin make install INSTALLDIR=$out/bin make install
''; '';
crossAttrs = {
makeFlagsArray = [ "TCC=${stdenv.cross.config}-gcc" ];
};
meta = { meta = {
description = "Simple, high-reliability, distributed software configuration management."; description = "Simple, high-reliability, distributed software configuration management.";
longDescription = '' longDescription = ''

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

@ -31,10 +31,13 @@ stdenv.mkDerivation rec {
export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}" export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}"
''; '';
# Openssl installs readonly files, which otherwise we can't strip.
# This could at some stdenv hash change be put out of crossAttrs, too
postInstall = '' postInstall = ''
# Openssl installs readonly files, which otherwise we can't strip.
# This could at some stdenv hash change be put out of crossAttrs, too
chmod -R +w $out chmod -R +w $out
# Remove references to perl, to avoid depending on it at runtime
rm $out/bin/c_rehash $out/ssl/misc/CA.pl $out/ssl/misc/tsget
''; '';
configureScript = "./Configure"; configureScript = "./Configure";
}; };