mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
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:
parent
e97ad11560
commit
3f05ed581f
@ -19,6 +19,10 @@ stdenv.mkDerivation {
|
||||
INSTALLDIR=$out/bin make install
|
||||
'';
|
||||
|
||||
crossAttrs = {
|
||||
makeFlagsArray = [ "TCC=${stdenv.cross.config}-gcc" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Simple, high-reliability, distributed software configuration management.";
|
||||
longDescription = ''
|
||||
|
@ -31,10 +31,13 @@ stdenv.mkDerivation rec {
|
||||
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 = ''
|
||||
# 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
|
||||
|
||||
# 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";
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user