summary refs log tree commit diff
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2011-11-16 21:04:02 +0000
committerShea Levy <shea@shealevy.com>2011-11-16 21:04:02 +0000
commit10cbd003966e67ad4ae40a82ba1a8496cd239536 (patch)
treee9b5eb14165e9ee728aaee521ad57d6daea1dbdc /pkgs/tools/package-management
parente895fe5e2fdeea03810a309b08426b6aacdb7c2e (diff)
Allow cross-compiling configurations to explicitly give a system string when cross-building nix
svn path=/nixpkgs/trunk/; revision=30458
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r--pkgs/tools/package-management/nix/unstable.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index da70ed6bb0fbe..921e902e0611d 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -36,7 +36,9 @@ stdenv.mkDerivation rec {
         --with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl
         --disable-init-state
         CFLAGS=-O3 CXXFLAGS=-O3
-      '';
+      '' + stdenv.lib.optionalString (
+          stdenv.cross ? nix && stdenv.cross.nix ? system
+      ) ''--with-system=${stdenv.cross.nix.system}'';
     doCheck = false;
   };