From 794b722ccac1bee87b013eeba085df1c1fad6bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 23 Nov 2010 20:47:23 +0000 Subject: [PATCH] Making sysvinit and mingetty crossbuild svn path=/nixpkgs/branches/stdenv-updates/; revision=24829 --- pkgs/os-specific/linux/mingetty/default.nix | 4 ++++ pkgs/os-specific/linux/sysvinit/default.nix | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix index fc3c50e1986e..b27baa5480b9 100644 --- a/pkgs/os-specific/linux/mingetty/default.nix +++ b/pkgs/os-specific/linux/mingetty/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation { sha256 = "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g"; }; + crossAttrs = { + makeFlags = "CC=${stdenv.cross.config}-gcc"; + }; + preInstall = '' ensureDir $out/sbin $out/share/man/man8 makeFlagsArray=(SBINDIR=$out/sbin MANDIR=$out/share/man/man8) diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index a05638dcb77c..4fa2a55367aa 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation { makeFlags = "SULOGINLIBS=-lcrypt ROOT=$(out) MANDIR=/share/man"; + crossAttrs = { + makeFlags = "SULOGINLIBS=-lcrypt ROOT=$(out) MANDIR=/share/man CC=${stdenv.cross.config}-gcc"; + }; + preInstall = '' substituteInPlace src/Makefile --replace /usr /