uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
32
pkgs/development/tools/toluapp/default.nix
Normal file
32
pkgs/development/tools/toluapp/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib, stdenv, fetchFromGitHub, sconsPackages, lua }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.93";
|
||||
pname = "toluapp";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LuaDist";
|
||||
repo = "toluapp";
|
||||
rev = version;
|
||||
sha256 = "0zd55bc8smmgk9j4cf0jpibb03lgsvl0knpwhplxbv93mcdnw7s0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ sconsPackages.scons_3_0_1 ];
|
||||
buildInputs = [ lua ];
|
||||
|
||||
patches = [ ./environ-and-linux-is-kinda-posix.patch ./headers.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace config_posix.py \
|
||||
--replace /usr/local $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to integrate C/Cpp code with Lua";
|
||||
homepage = "http://www.codenix.com/~tolua/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ vrthra ];
|
||||
mainProgram = "tolua++";
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
As it turns out, scons doesn't inherit environment variables by
|
||||
default. Debugging this was very pleasant. -- oxij
|
||||
|
||||
diff --git a/SConstruct b/SConstruct
|
||||
index 5c1e774..66aa4c8 100644
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -5,13 +5,11 @@ tools = ['default']
|
||||
if os.name == 'nt':
|
||||
tools = ['mingw']
|
||||
|
||||
-env = Environment(tools = tools)
|
||||
+env = Environment(tools = tools, ENV = os.environ)
|
||||
|
||||
options_file = None
|
||||
-if sys.platform == 'linux2':
|
||||
- options_file = "linux"
|
||||
|
||||
-elif 'msvc' in env['TOOLS']:
|
||||
+if 'msvc' in env['TOOLS']:
|
||||
options_file = "msvc"
|
||||
else:
|
||||
options_file = "posix"
|
||||
diff --git a/config_posix.py b/config_posix.py
|
||||
index 2bb696c..eb4eb9b 100644
|
||||
--- a/config_posix.py
|
||||
+++ b/config_posix.py
|
||||
@@ -16,7 +16,7 @@ CCFLAGS = ['-O2', '-ansi', '-Wall']
|
||||
prefix = '/usr/local'
|
||||
|
||||
# libraries
|
||||
-LIBS = ['lua', 'lualib', 'm']
|
||||
+LIBS = ['lua', 'liblua', 'm']
|
||||
|
||||
|
||||
|
||||
15
pkgs/development/tools/toluapp/headers.patch
Normal file
15
pkgs/development/tools/toluapp/headers.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/include/tolua++.h b/include/tolua++.h
|
||||
index ed53449..f57d56d 100644
|
||||
--- a/include/tolua++.h
|
||||
+++ b/include/tolua++.h
|
||||
@@ -43,8 +43,8 @@ extern "C" {
|
||||
|
||||
typedef int lua_Object;
|
||||
|
||||
-#include "lua.h"
|
||||
-#include "lauxlib.h"
|
||||
+#include <lua.h>
|
||||
+#include <lauxlib.h>
|
||||
|
||||
struct tolua_Error
|
||||
{
|
||||
Loading…
Add table
Add a link
Reference in a new issue