diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-01 21:21:26 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-01 21:21:26 +0000 |
| commit | da3ba13fb57d4c9415f42906772c180f7ac9486c (patch) | |
| tree | 2674fb7d7520c1cdb0c72fb145f2f06357f97f78 /pkgs/development/libraries | |
| parent | 2954596106c5d6e96c9f121573a05baf4bc8630d (diff) | |
| download | nixpkgs-da3ba13fb57d4c9415f42906772c180f7ac9486c.tar nixpkgs-da3ba13fb57d4c9415f42906772c180f7ac9486c.tar.gz nixpkgs-da3ba13fb57d4c9415f42906772c180f7ac9486c.tar.bz2 nixpkgs-da3ba13fb57d4c9415f42906772c180f7ac9486c.tar.lz nixpkgs-da3ba13fb57d4c9415f42906772c180f7ac9486c.tar.xz nixpkgs-da3ba13fb57d4c9415f42906772c180f7ac9486c.tar.zst nixpkgs-da3ba13fb57d4c9415f42906772c180f7ac9486c.zip | |
Trying to make gcc 4.5 cross-buildable
svn path=/nixpkgs/branches/stdenv-updates/; revision=22848
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/cloog-ppl/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/gettext/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/ppl/default.nix | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index b1372d79cb5..5738f76682a 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { configureFlags = "--with-ppl=${ppl}"; + crossAttrs = { + configureFlags = "--with-ppl=${ppl.hostDrv}"; + }; + doCheck = true; meta = { diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index f7f0cb0018c..ddcfc327a9e 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation (rec { crossAttrs = { buildInputs = stdenv.lib.optional (stdenv.gccCross.libc ? libiconv) stdenv.gccCross.libc.libiconv.hostDrv; + # Gettext fails to guess the cross compiler + configureFlags = "CXX=${stdenv.cross.config}-g++"; }; meta = { diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index 9b52958b3e5..cbe6ee21ecd 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -9,7 +9,7 @@ let version = "0.10.2"; in sha256 = "0lly44sac4jd72klnhhil3wha15vak76r6gy88sh0zjsaww9hf6h"; }; - buildInputs = [ perl gnum4 ]; + buildNativeInputs = [ perl gnum4 ]; propagatedBuildInputs = [ gmpxx ]; # Beware! It took ~6 hours to compile PPL and run its tests on a 1.2 GHz |