diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-01-03 19:12:06 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-01-03 19:12:06 +0000 |
| commit | e43bd7c4cea2d642ff06cd584cf8c6de20643dcd (patch) | |
| tree | 3b421125e59aa1a7714fded21d27341379e490f6 | |
| parent | 29d613ba0e9aa5ef2dd83511e997105cb7a8bc46 (diff) | |
| download | nixlib-e43bd7c4cea2d642ff06cd584cf8c6de20643dcd.tar nixlib-e43bd7c4cea2d642ff06cd584cf8c6de20643dcd.tar.gz nixlib-e43bd7c4cea2d642ff06cd584cf8c6de20643dcd.tar.bz2 nixlib-e43bd7c4cea2d642ff06cd584cf8c6de20643dcd.tar.lz nixlib-e43bd7c4cea2d642ff06cd584cf8c6de20643dcd.tar.xz nixlib-e43bd7c4cea2d642ff06cd584cf8c6de20643dcd.tar.zst nixlib-e43bd7c4cea2d642ff06cd584cf8c6de20643dcd.zip | |
Made lua and task warrior unstable crossbuild fine
svn path=/nixpkgs/trunk/; revision=31251
| -rw-r--r-- | pkgs/applications/misc/taskwarrior/unstable.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/interpreters/lua-5/default.nix | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/misc/taskwarrior/unstable.nix b/pkgs/applications/misc/taskwarrior/unstable.nix index 057ebbe57c53..a50654b28d25 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 19a5599347ff..06703e12210d 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 = { |