diff options
author | Jan Malakhovski <oxij@oxij.org> | 2015-03-24 18:53:10 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2015-03-26 13:03:17 +0000 |
commit | 46aa9361d6ce1374708b9c403a5a51d7e9aa9370 (patch) | |
tree | 5ec7a25029dc8d5495f979c88c07c339329f5b77 /pkgs/development/tools/toluapp | |
parent | 9a75c1d7c8ee19046ce67f2dc725821d2d5452fa (diff) | |
download | nixpkgs-46aa9361d6ce1374708b9c403a5a51d7e9aa9370.tar nixpkgs-46aa9361d6ce1374708b9c403a5a51d7e9aa9370.tar.gz nixpkgs-46aa9361d6ce1374708b9c403a5a51d7e9aa9370.tar.bz2 nixpkgs-46aa9361d6ce1374708b9c403a5a51d7e9aa9370.tar.lz nixpkgs-46aa9361d6ce1374708b9c403a5a51d7e9aa9370.tar.xz nixpkgs-46aa9361d6ce1374708b9c403a5a51d7e9aa9370.tar.zst nixpkgs-46aa9361d6ce1374708b9c403a5a51d7e9aa9370.zip |
tolua++ (toluapp): add version 1.0.92
Diffstat (limited to 'pkgs/development/tools/toluapp')
-rw-r--r-- | pkgs/development/tools/toluapp/default.nix | 33 | ||||
-rw-r--r-- | pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch | 36 |
2 files changed, 69 insertions, 0 deletions
diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix new file mode 100644 index 00000000000..5edc57e2f81 --- /dev/null +++ b/pkgs/development/tools/toluapp/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, scons, lua }: + +stdenv.mkDerivation rec { + version = "1.0.92"; + name = "toluapp-${version}"; + + src = fetchFromGitHub { + owner = "eddieringle"; + repo = "toluapp"; + rev = "b1e680dc486c17128a3c21f89db1693ff06c02b1"; + sha256 = "1d1a9bll9825dg4mz71vwykvfd3s5zi2yvzbfsvlr3qz1l3zqfwb"; + }; + + buildInputs = [ lua scons ]; + + patches = [ ./environ-and-linux-is-kinda-posix.patch ]; + + preConfigure = '' + substituteInPlace config_posix.py \ + --replace /usr/local $out + ''; + + NIX_CFLAGS_COMPILE = "-fPIC"; + + buildPhase = ''scons''; + + installPhase = ''scons install''; + + meta = { + licence = stdenv.lib.licenses.mit; + }; + +} diff --git a/pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch b/pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch new file mode 100644 index 00000000000..6743b25cb8a --- /dev/null +++ b/pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch @@ -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'] + + + |