From e43bd7c4cea2d642ff06cd584cf8c6de20643dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 3 Jan 2012 19:12:06 +0000 Subject: [PATCH] Made lua and task warrior unstable crossbuild fine svn path=/nixpkgs/trunk/; revision=31251 --- pkgs/applications/misc/taskwarrior/unstable.nix | 9 ++++++++- pkgs/development/interpreters/lua-5/default.nix | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/taskwarrior/unstable.nix b/pkgs/applications/misc/taskwarrior/unstable.nix index 057ebbe57c5..a50654b28d2 100644 --- a/pkgs/applications/misc/taskwarrior/unstable.nix +++ b/pkgs/applications/misc/taskwarrior/unstable.nix @@ -10,7 +10,14 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-ldl"; - buildInputs = [ cmake lua5 ]; + buildNativeInputs = [ cmake ]; + buildInputs = [ lua5 ]; + + crossAttrs = { + preConfigure = '' + export NIX_CROSS_LDFLAGS="$NIX_CROSS_LDFLAGS -ldl" + ''; + }; meta = { description = "Command-line todo list manager"; diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 19a5599347f..06703e12210 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation { -e "s/ ranlib/$crossConfig-ranlib/" \ src/Makefile ''; + dontStrip = true; }; meta = {