Author: viric
Date: Tue Jan 3 19:12:06 2012
New Revision: 31251
URL: https://nixos.org/websvn/nix/?rev=31251&sc=1
Log:
Made lua and task warrior unstable crossbuild fine
Modified:
nixpkgs/trunk/pkgs/applications/misc/taskwarrior/unstable.nix
nixpkgs/trunk/pkgs/development/interpreters/lua-5/default.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/taskwarrior/unstable.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/misc/taskwarrior/unstable.nix Tue Jan
3 18:13:10 2012 (r31250)
+++ nixpkgs/trunk/pkgs/applications/misc/taskwarrior/unstable.nix Tue Jan
3 19:12:06 2012 (r31251)
@@ -10,7 +10,14 @@
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";
Modified: nixpkgs/trunk/pkgs/development/interpreters/lua-5/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/interpreters/lua-5/default.nix Tue Jan
3 18:13:10 2012 (r31250)
+++ nixpkgs/trunk/pkgs/development/interpreters/lua-5/default.nix Tue Jan
3 19:12:06 2012 (r31251)
@@ -30,6 +30,7 @@
-e "s/ ranlib/$crossConfig-ranlib/" \
src/Makefile
'';
+ dontStrip = true;
};
meta = {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
