From 3f05ed581fb203987fb31733422e0490cedef5ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 11 Aug 2010 20:08:29 +0000 Subject: [PATCH] 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 --- pkgs/applications/version-management/fossil/default.nix | 4 ++++ pkgs/development/libraries/openssl/default.nix | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index b9f6ec941b4a..e9334db2ee2f 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -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 = '' diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index d19ca77a1895..6b1efd7bc03d 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -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"; };